2026-06-25 18:35:52 +02:00
|
|
|
"""Startup re-adoption of still-running agent containers into ``_instances``.
|
|
|
|
|
|
|
|
|
|
An orchestrator restart loses the in-memory ``_instances`` registry while the
|
|
|
|
|
agent containers keep running. The reaper has a Docker-liveness fallback for
|
|
|
|
|
that (``_assignee_container_running``), but the spawn gate's ``_is_agent_active``
|
|
|
|
|
does not — so after a restart it sees a live agent as inactive and can
|
|
|
|
|
double-spawn it onto work its forgotten-but-running container is already doing.
|
|
|
|
|
``_readopt_running_agents`` probes each known agent slug's container and
|
|
|
|
|
re-registers a minimal ACTIVE instance for any that is running, so both the
|
2026-06-30 08:08:35 +02:00
|
|
|
reaper's live-skip and the spawn gate see the live agent immediately. A running
|
|
|
|
|
container whose slug no longer holds a live (non-terminal) claim is a zombie
|
|
|
|
|
left over after a prior orchestrator released the claim — it is NOT registered,
|
|
|
|
|
so it can't block the spawn gate from re-dispatching that slug (#72).
|
2026-06-25 18:35:52 +02:00
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
2026-06-29 05:38:21 +02:00
|
|
|
from typing import Any
|
2026-06-25 18:35:52 +02:00
|
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
from roboco.runtime.orchestrator import AgentOrchestrator, AgentState
|
|
|
|
|
|
|
|
|
|
_EXPECTED_READOPTED = 2
|
|
|
|
|
|
|
|
|
|
|
2026-06-29 05:38:21 +02:00
|
|
|
def _orch() -> Any:
|
2026-06-25 18:35:52 +02:00
|
|
|
orch = AgentOrchestrator.__new__(AgentOrchestrator) # bypass __init__
|
|
|
|
|
orch._instances = {}
|
|
|
|
|
return orch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopts_running_containers_as_active() -> None:
|
|
|
|
|
orch = _orch()
|
|
|
|
|
running = {"be-dev-1", "fe-pm"}
|
|
|
|
|
|
|
|
|
|
async def inspect(name: str) -> tuple[bool, int | None]:
|
|
|
|
|
slug = name.removeprefix("roboco-agent-")
|
|
|
|
|
return (slug in running, 0)
|
|
|
|
|
|
2026-06-29 05:38:21 +02:00
|
|
|
orch._inspect_container_state = AsyncMock(side_effect=inspect)
|
2026-06-30 08:08:35 +02:00
|
|
|
orch._agent_holds_live_claim = AsyncMock(return_value=True) # mid-task → live
|
2026-06-25 18:35:52 +02:00
|
|
|
|
|
|
|
|
n = await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert n == _EXPECTED_READOPTED
|
|
|
|
|
assert orch._instances["be-dev-1"].state == AgentState.ACTIVE
|
|
|
|
|
assert orch._instances["be-dev-1"].agent_id == "be-dev-1"
|
|
|
|
|
assert orch._instances["fe-pm"].state == AgentState.ACTIVE
|
|
|
|
|
assert "be-dev-2" not in orch._instances # probed, not running → untracked
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_leaves_already_tracked_instance_untouched() -> None:
|
|
|
|
|
orch = _orch()
|
|
|
|
|
sentinel = MagicMock()
|
|
|
|
|
orch._instances = {"be-dev-1": sentinel}
|
2026-06-29 05:38:21 +02:00
|
|
|
orch._inspect_container_state = AsyncMock(return_value=(True, 0))
|
2026-06-25 18:35:52 +02:00
|
|
|
|
|
|
|
|
await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert orch._instances["be-dev-1"] is sentinel # not re-adopted over
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_inert_when_nothing_running() -> None:
|
|
|
|
|
orch = _orch()
|
2026-06-29 05:38:21 +02:00
|
|
|
orch._inspect_container_state = AsyncMock(return_value=(False, None))
|
2026-06-25 18:35:52 +02:00
|
|
|
|
|
|
|
|
n = await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert n == 0
|
|
|
|
|
assert orch._instances == {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_swallows_probe_errors() -> None:
|
|
|
|
|
orch = _orch()
|
2026-06-29 05:38:21 +02:00
|
|
|
orch._inspect_container_state = AsyncMock(side_effect=RuntimeError("no docker"))
|
2026-06-25 18:35:52 +02:00
|
|
|
|
|
|
|
|
n = await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert n == 0 # best-effort: a probe failure never raises into startup
|
2026-06-29 05:38:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_records_container_id_so_health_check_can_see_exit() -> None:
|
|
|
|
|
# Re-adopt must capture the real container id; a None container_id is skipped
|
|
|
|
|
# by _check_health, stranding the task under a phantom ACTIVE instance.
|
|
|
|
|
orch = _orch()
|
|
|
|
|
orch._inspect_container_state = AsyncMock(return_value=(True, 0))
|
|
|
|
|
orch._resolve_container_id = AsyncMock(return_value="deadbeef1234")
|
2026-06-30 08:08:35 +02:00
|
|
|
orch._agent_holds_live_claim = AsyncMock(return_value=True) # live claim
|
2026-06-29 05:38:21 +02:00
|
|
|
|
|
|
|
|
await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
inst = orch._instances[next(iter(orch._instances))]
|
|
|
|
|
assert inst.container_id == "deadbeef1234"
|
|
|
|
|
assert inst.state == AgentState.ACTIVE
|
2026-06-30 08:08:35 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
# #72: a running container whose slug holds NO live claim is a zombie left
|
|
|
|
|
# over after a prior orchestrator released the claim — it must NOT be
|
|
|
|
|
# registered ACTIVE, or it blocks the spawn gate from re-dispatching that slug
|
|
|
|
|
# until the stale container is eventually noticed.
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_skips_zombie_container_with_no_live_claim() -> None:
|
|
|
|
|
"""#72: a running container that owns no non-terminal task is a zombie.
|
|
|
|
|
Registering it ACTIVE would block re-dispatch of its slug; skip it instead."""
|
|
|
|
|
orch = _orch()
|
|
|
|
|
orch._inspect_container_state = AsyncMock(return_value=(True, 0))
|
|
|
|
|
orch._resolve_container_id = AsyncMock(return_value="deadbeef1234")
|
|
|
|
|
orch._agent_holds_live_claim = AsyncMock(return_value=False) # claim released
|
|
|
|
|
|
|
|
|
|
n = await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert n == 0 # zombie not re-adopted
|
|
|
|
|
assert orch._instances == {} # spawn gate free to dispatch the slug fresh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_readopt_failopen_registers_on_claim_lookup_error() -> None:
|
|
|
|
|
"""#72: a DB error in the live-claim lookup is indeterminate — fall back to
|
|
|
|
|
today's register behaviour so a startup DB hiccup can't regress the
|
|
|
|
|
cold-start double-spawn protection the readopt exists to provide."""
|
|
|
|
|
orch = _orch()
|
|
|
|
|
running = {"be-dev-1"}
|
|
|
|
|
|
|
|
|
|
async def inspect(name: str) -> tuple[bool, int | None]:
|
|
|
|
|
return (name.removeprefix("roboco-agent-") in running, 0)
|
|
|
|
|
|
|
|
|
|
orch._inspect_container_state = AsyncMock(side_effect=inspect)
|
|
|
|
|
orch._resolve_container_id = AsyncMock(return_value="deadbeef1234")
|
|
|
|
|
orch._agent_holds_live_claim = AsyncMock(return_value=None) # lookup failed
|
|
|
|
|
|
|
|
|
|
n = await orch._readopt_running_agents()
|
|
|
|
|
|
|
|
|
|
assert n == 1 # fail-open: register rather than risk a double-spawn
|
|
|
|
|
inst = orch._instances[next(iter(orch._instances))]
|
|
|
|
|
assert inst.state == AgentState.ACTIVE
|