[F033] orchestrator: capture container_id at startup re-adoption

_readopt_running_agents registered re-adopted ACTIVE instances with
container_id=None. _check_health skips container_id-is-None instances, so
when a re-adopted container later exited the stopped-container handler
never ran and the task stranded under a phantom ACTIVE instance forever.

Add _resolve_container_id (docker inspect -f '{{.Id}}') and store the real
id on re-adopt. Best-effort: a probe failure degrades to None (still
ACTIVE; the reaper's Docker-liveness fallback covers it).
This commit is contained in:
Renn F
2026-06-28 10:58:30 +02:00
parent 2c3a51df67
commit fa8e567edd
2 changed files with 59 additions and 1 deletions
@@ -77,3 +77,21 @@ async def test_readopt_swallows_probe_errors() -> None:
n = await orch._readopt_running_agents()
assert n == 0 # best-effort: a probe failure never raises into startup
@pytest.mark.asyncio
async def test_readopt_records_container_id_so_health_check_can_see_exit() -> None:
# F033: a re-adopted instance registered with container_id=None is skipped by
# _check_health (`if instance.container_id is None: continue`), so when the
# container later exits the stopped-container handler never runs — the task
# is stranded under a phantom ACTIVE instance forever. Re-adopt must capture
# the real container id so the health loop can observe the later exit.
orch = _orch()
orch._inspect_container_state = AsyncMock(return_value=(True, 0)) # type: ignore[method-assign]
orch._resolve_container_id = AsyncMock(return_value="deadbeef1234") # type: ignore[method-assign]
await orch._readopt_running_agents()
inst = orch._instances[next(iter(orch._instances))]
assert inst.container_id == "deadbeef1234"
assert inst.state == AgentState.ACTIVE