mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* feat(sandbox): pluggable per-engine registry (postgres/redis/mongo) Replaces the hardcoded postgres+redis branches in the provisioner and the env emitter with a registry of SandboxEngine specs (image, run args, readiness probe, connection, ROBOCO_TEST_* env) in a pure low module (roboco/models/sandbox.py). VALID_SANDBOX_SERVICES is derived from the registry — single source of truth — and the provisioner + orchestrator iterate it, so adding an engine is one class + one registry line, not another branch. Adds a mongo:8-alpine engine (ROBOCO_TEST_MONGO_*) as the third service alongside postgres/redis. Also fixes the cold-pull loop that stranded v0.19.0 board agents with empty error strings: docker run pulled inline under a 20s deadline, so a NAS cold pull was killed, cancelled, and re-pulled from scratch forever. _ensure_image now inspects + pulls (300s) before run; provisioning errors log type+message so a bare TimeoutError no longer shows as "". Panel edit-project dialog: postgres/redis toggles -> a Set<string> multi-select driven by a SANDBOX_SERVICES catalog, so new engines appear in the UI by adding to the catalog. Tests: engine parity (allowlist==registry, unique slugs/images, no None leak in env, SandboxInfo aggregates every engine), mongo provision + env injection, plus the existing postgres/redis provision/env/spawn/janitor suite updated to the registry shape. 821 unit / 5 skip green; ruff + mypy (360 files) clean. * docs(sandbox): reflect pluggable engine registry + mongo across docs CHANGELOG (0.19.0): Added entry for the pluggable sandbox engine registry (postgres/redis/mongo) + Fixed entry for the cold-pull loop/empty-error strand that boarded v0.19.0 board agents. docs/map (9 files): sandbox subsystem blurbs, SandboxProvisioner rows, _maybe_provision_sandbox/_append_sandbox_env rows, feature-flag rows, the migration-057 row + v0.17.0 delta, and the models.md VALID_SANDBOX_SERVICES note — all retitled to DB/Redis/Mongo via the engine registry (roboco/models/sandbox.py), with the one-class-one-line extension story and the _ensure_image cold-pull fix. Production-network (roboco_data) lines left as postgres+redis — mongo is sandbox-only, not a prod service. docs/rag (3 files): sandbox-db.md rewritten around the registry (engine list, generic _provision_engine, image pre-pull, ROBOCO_TEST_DB_*/REDIS_*/MONGO_* incl. MONGO_AUTH_DB=admin, single emit_env); config-reference sandbox flag row + subsection retitled; db-network-isolation framing broadened to postgres/redis/mongo. preconditions-and-rejections left untouched (its hit was an unrelated gateway see-also link). * test(e2e): harden umbrella close terminal reads with bounded wait-for-state The MegaTask umbrella close test flaked once on CI (ceo-approve returned 200 but the re-fetch saw awaiting_pm_review) then passed on re-run. The production path is deterministic: complete -> main_pm_complete -> submit_pm_review -> escalate_to_ceo -> ceo_approve -> commit, all on one session, all awaited; the fire-and-forget completion hooks are isolated (own session, best-effort, never touch task.status or the request session). 20 local runs could not reproduce it. The one real surface is the read pattern: the e2e stack commits on the uvicorn thread's loop and reads via a separate loop (run_db -> asyncio.run with a fresh engine), so a terminal single point-read can race a still-draining completion hook on a contended runner. Replace the two terminal point-reads with a bounded wait_for_status poll. Strictly better than a one-shot read: absorbs the transient, and a genuine state bug still surfaces via the timeout branch asserting against the last-read state. --------- Co-authored-by: Renn F <rennf93@users.noreply.github.com>
299 lines
11 KiB
Python
299 lines
11 KiB
Python
"""SandboxProvisioner: throwaway per-spawn Postgres/Redis sibling containers.
|
|
|
|
All docker calls are mocked — no real docker in unit tests. Readiness
|
|
deadlines are monkeypatched down so the timeout path runs in milliseconds.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
|
|
import pytest
|
|
from roboco.runtime import sandbox as sandbox_module
|
|
from roboco.runtime.sandbox import SandboxProvisioner, SandboxProvisionError
|
|
|
|
_NETWORK = "roboco_default"
|
|
_PG_PORT = 5432
|
|
_REDIS_PORT = 6379
|
|
_MONGO_PORT = 27017
|
|
|
|
|
|
class _FakeRunner:
|
|
"""Records every docker invocation; behavior configured per test."""
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
run_rc: int = 0,
|
|
exec_rc: int = 0,
|
|
teardown_rc: int = 0,
|
|
ps_output: bytes = b"",
|
|
ps_live_output: bytes = b"",
|
|
) -> None:
|
|
self.calls: list[list[str]] = []
|
|
self.run_rc = run_rc
|
|
self.exec_rc = exec_rc
|
|
self.teardown_rc = teardown_rc
|
|
self.ps_output = ps_output
|
|
self.ps_live_output = ps_live_output
|
|
# Image state — defaults assume the image is already present (the happy
|
|
# path skips the pull). Tests exercising the pull path override these.
|
|
self.image_present: bool = True
|
|
self.pull_rc: int = 0
|
|
self._ps_call_count = 0
|
|
|
|
async def __call__(
|
|
self, args: list[str], _timeout: float
|
|
) -> tuple[int, bytes, bytes]:
|
|
self.calls.append(args)
|
|
verb = args[0]
|
|
if verb == "run":
|
|
return self.run_rc, b"container-id\n", b""
|
|
if verb == "exec":
|
|
return self.exec_rc, b"", b""
|
|
if verb in ("stop", "kill", "rm"):
|
|
return self.teardown_rc, b"", b""
|
|
if verb == "image":
|
|
# `image inspect <img>` — rc 0 means present (skip pull).
|
|
if args[1] != "inspect":
|
|
raise AssertionError(f"unexpected image subverb: {args[1]}")
|
|
return (0 if self.image_present else 1), b"", b""
|
|
if verb == "pull":
|
|
return self.pull_rc, b"", b"" if self.pull_rc == 0 else b"pull failed\n"
|
|
if verb == "ps":
|
|
self._ps_call_count += 1
|
|
# First ps call = the sandbox-labeled listing; second = live agents.
|
|
listing = (
|
|
self.ps_output if self._ps_call_count == 1 else self.ps_live_output
|
|
)
|
|
return 0, listing, b""
|
|
raise AssertionError(f"unexpected docker verb: {verb}")
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _fast_readiness_deadlines(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
"""Shrink the polling cadence + every engine's deadline so the timeout path
|
|
is fast in tests. Deadlines live on the engine instances now (not module
|
|
constants), so monkeypatch them on the registry."""
|
|
monkeypatch.setattr(sandbox_module, "_READY_POLL_INTERVAL_SECONDS", 0.01)
|
|
for engine in sandbox_module.SANDBOX_ENGINES.values():
|
|
monkeypatch.setattr(engine, "ready_deadline", 0.05)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_both_services_happy_path() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
info = await provisioner.provision("dev-1", ["postgres", "redis"])
|
|
|
|
pg = info.services["postgres"]
|
|
assert pg.host == "roboco-sandbox-pg-dev-1"
|
|
assert pg.port == _PG_PORT
|
|
assert pg.user == "sandbox"
|
|
assert pg.database == "sandbox"
|
|
rd = info.services["redis"]
|
|
assert rd.host == "roboco-sandbox-redis-dev-1"
|
|
assert rd.port == _REDIS_PORT
|
|
# Passwords are per-sandbox random tokens, not equal to each other.
|
|
assert pg.password != rd.password
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_labels_are_correct() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.provision("dev-2", ["postgres"])
|
|
|
|
run_call = next(c for c in runner.calls if c[0] == "run")
|
|
assert "--network" in run_call
|
|
assert run_call[run_call.index("--network") + 1] == _NETWORK
|
|
label_indices = [i for i, a in enumerate(run_call) if a == "--label"]
|
|
labels = [run_call[i + 1] for i in label_indices]
|
|
assert sandbox_module.SANDBOX_LABEL in labels
|
|
assert "roboco.sandbox.owner=roboco-agent-dev-2" in labels
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_mongo_engine() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
info = await provisioner.provision("dev-mongo", ["mongo"])
|
|
|
|
mongo = info.services["mongo"]
|
|
assert mongo.host == "roboco-sandbox-mongo-dev-mongo"
|
|
assert mongo.port == _MONGO_PORT
|
|
assert mongo.user == "sandbox"
|
|
assert mongo.database == "admin"
|
|
run_call = next(c for c in runner.calls if c[0] == "run")
|
|
assert "mongo:8-alpine" in run_call
|
|
# MONGO_INITDB_ROOT_PASSWORD env is baked into the run.
|
|
assert any(a.startswith("MONGO_INITDB_ROOT_PASSWORD=") for a in run_call)
|
|
# /data/db tmpfs mount for the engine.
|
|
assert "--tmpfs" in run_call
|
|
assert run_call[run_call.index("--tmpfs") + 1] == "/data/db"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_readiness_timeout_tears_down_and_raises() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=1) # container starts, never ready
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
with pytest.raises(SandboxProvisionError):
|
|
await provisioner.provision("dev-3", ["postgres"])
|
|
|
|
# Teardown attempted for the container that failed readiness.
|
|
teardown_verbs = {c[0] for c in runner.calls if c[0] in ("stop", "kill", "rm")}
|
|
assert "stop" in teardown_verbs or "rm" in teardown_verbs
|
|
rm_calls = [c for c in runner.calls if c[0] == "rm"]
|
|
assert any("roboco-sandbox-pg-dev-3" in c for c in rm_calls)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_run_failure_tears_down_and_raises() -> None:
|
|
runner = _FakeRunner(run_rc=1) # docker run itself fails
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
with pytest.raises(SandboxProvisionError):
|
|
await provisioner.provision("dev-4", ["redis"])
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_rejects_unknown_service() -> None:
|
|
runner = _FakeRunner()
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
with pytest.raises(SandboxProvisionError):
|
|
await provisioner.provision("dev-5", ["mysql"])
|
|
# Nothing was ever run for an unknown service.
|
|
assert runner.calls == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_idempotent_on_missing_container() -> None:
|
|
runner = _FakeRunner(teardown_rc=1) # "no such container" for every verb
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
# Must not raise even though every teardown call reports failure.
|
|
await provisioner.teardown("never-provisioned")
|
|
|
|
verbs = [c[0] for c in runner.calls]
|
|
assert "rm" in verbs
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_janitor_removes_orphaned_sandbox_only() -> None:
|
|
# Two sandboxes on the host: one owned by a still-live agent, one orphaned.
|
|
ps_output = (
|
|
b"roboco-sandbox-pg-alive\troboco-agent-alive\n"
|
|
b"roboco-sandbox-pg-orphan\troboco-agent-orphan\n"
|
|
)
|
|
live_output = b"roboco-agent-alive\n"
|
|
runner = _FakeRunner(ps_output=ps_output, ps_live_output=live_output)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.janitor_sweep()
|
|
|
|
rm_calls = [c for c in runner.calls if c[0] == "rm"]
|
|
torn_down = {c[-1] for c in rm_calls}
|
|
assert "roboco-sandbox-pg-orphan" in torn_down
|
|
assert "roboco-sandbox-pg-alive" not in torn_down
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_janitor_noop_when_no_sandboxes() -> None:
|
|
runner = _FakeRunner(ps_output=b"")
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.janitor_sweep()
|
|
|
|
assert all(c[0] != "rm" for c in runner.calls)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_preclears_stale_sandboxes_before_run() -> None:
|
|
"""A crash-missed teardown leaves same-named containers; provision must
|
|
clear them first or `docker run` fails on the name conflict."""
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.provision("dev-6", ["postgres"])
|
|
|
|
first_run = next(i for i, c in enumerate(runner.calls) if c[0] == "run")
|
|
preclear_rms = [
|
|
c for c in runner.calls[:first_run] if c[0] == "rm" and c[-1].endswith("dev-6")
|
|
]
|
|
assert any("roboco-sandbox-pg-dev-6" in c for c in preclear_rms)
|
|
assert any("roboco-sandbox-redis-dev-6" in c for c in preclear_rms)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_janitor_grace_skips_freshly_provisioned_owner() -> None:
|
|
"""A sandbox is provisioned before its agent container exists — a sweep
|
|
racing that mid-flight spawn must not reap the fresh sandbox."""
|
|
ps_output = b"roboco-sandbox-pg-fresh\troboco-agent-fresh\n"
|
|
runner = _FakeRunner(ps_output=ps_output, ps_live_output=b"")
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
provisioner._provisioned_at = {"roboco-agent-fresh": time.monotonic()}
|
|
|
|
await provisioner.janitor_sweep()
|
|
|
|
assert all(c[0] != "rm" for c in runner.calls)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_janitor_reaps_after_grace_expiry() -> None:
|
|
ps_output = b"roboco-sandbox-pg-old\troboco-agent-old\n"
|
|
runner = _FakeRunner(ps_output=ps_output, ps_live_output=b"")
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
provisioner._provisioned_at = {
|
|
"roboco-agent-old": time.monotonic()
|
|
- 10 * sandbox_module._JANITOR_GRACE_SECONDS
|
|
}
|
|
|
|
await provisioner.janitor_sweep()
|
|
|
|
rm_calls = [c for c in runner.calls if c[0] == "rm"]
|
|
assert any("roboco-sandbox-pg-old" in c for c in rm_calls)
|
|
assert provisioner._provisioned_at == {}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_skips_pull_when_image_present() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.provision("dev-7", ["postgres"])
|
|
|
|
assert any(c[0] == "image" and c[1] == "inspect" for c in runner.calls)
|
|
assert not any(c[0] == "pull" for c in runner.calls)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_pulls_when_image_absent() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
runner.image_present = False
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
await provisioner.provision("dev-8", ["postgres"])
|
|
|
|
inspect = [c for c in runner.calls if c[0] == "image" and c[1] == "inspect"]
|
|
pulls = [c for c in runner.calls if c[0] == "pull"]
|
|
assert inspect and pulls
|
|
assert pulls[0][-1] == "postgres:16-alpine"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_provision_pull_failure_raises() -> None:
|
|
runner = _FakeRunner(run_rc=0, exec_rc=0)
|
|
runner.image_present = False
|
|
runner.pull_rc = 1
|
|
provisioner = SandboxProvisioner(network=_NETWORK, runner=runner)
|
|
|
|
with pytest.raises(SandboxProvisionError, match="image pull failed"):
|
|
await provisioner.provision("dev-9", ["postgres"])
|
|
# `docker run` never reached — pull failed first.
|
|
assert not any(c[0] == "run" for c in runner.calls)
|