a05cc257f1
The orchestrator runs the repo's code bind-mounted, but the Python process loads it at startup and never reloads — and ensure_running reused a healthy-but-stale container. So after a code change (e.g. the token fix), the running orchestrator kept executing OLD control-plane code that dropped the new /bottles 'tokens' field, and egress auth injection stayed broken no matter how many times the gateway image was rebuilt. ensure_running now always recreates the orchestrator container (cheap; the registry DB persists and the current launch re-registers its in-memory state). Combined with the gateway's image-staleness recreate, a fresh 'start' now runs current code end to end. Validated live: register an authed route + in-memory token -> a client at the bottle IP curling through the gateway proxy receives the injected 'Authorization: Bearer <token>' header. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
166 lines
6.7 KiB
Python
166 lines
6.7 KiB
Python
"""Orchestrator + gateway lifecycle (PRD 0070, docker slice).
|
|
|
|
Runs the orchestrator control plane **as a container** on the shared gateway
|
|
network, alongside the gateway container. This is the PRD's "virtualize the
|
|
orchestrator": container↔container between the gateway and the orchestrator
|
|
avoids the host firewall (which drops container→host traffic), and the gateway
|
|
reaches the control plane by container name over docker DNS. The host CLI
|
|
reaches it via a published loopback port.
|
|
|
|
The orchestrator runs with the **register-only broker** — the *backend*
|
|
launches agent containers (compose), so the orchestrator needs no docker
|
|
socket. That keeps this control-plane container unprivileged; the host manages
|
|
both containers. `ensure_running` is an idempotent singleton (fixed container
|
|
names + the published port).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
import urllib.error
|
|
import urllib.request
|
|
from pathlib import Path
|
|
|
|
from .. import log
|
|
from ..docker_cmd import run_docker
|
|
from ..paths import bot_bottle_root
|
|
from .gateway import GATEWAY_IMAGE, GATEWAY_NETWORK, DockerGateway
|
|
|
|
DEFAULT_PORT = 8099
|
|
ORCHESTRATOR_NAME = "bot-bottle-orchestrator"
|
|
ORCHESTRATOR_LABEL = "bot-bottle-orchestrator=1"
|
|
|
|
# The repo root is bind-mounted into the control-plane container so
|
|
# `python -m bot_bottle.orchestrator` resolves the package (the orchestrator
|
|
# is stdlib-only, so the bundle image's python is enough).
|
|
_REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
_APP_DIR = "/app"
|
|
_ROOT_IN_CONTAINER = "/bot-bottle-root"
|
|
|
|
_HEALTH_POLL_SECONDS = 0.25
|
|
DEFAULT_STARTUP_TIMEOUT_SECONDS = 45.0
|
|
_HEALTH_REQUEST_TIMEOUT_SECONDS = 1.0
|
|
|
|
|
|
class OrchestratorStartError(RuntimeError):
|
|
"""The orchestrator container did not become healthy within the timeout."""
|
|
|
|
|
|
class OrchestratorService:
|
|
"""Manages the orchestrator control-plane container + the shared gateway.
|
|
Callers only need `ensure_running()` + `url`."""
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
port: int = DEFAULT_PORT,
|
|
network: str = GATEWAY_NETWORK,
|
|
image: str = GATEWAY_IMAGE,
|
|
repo_root: Path = _REPO_ROOT,
|
|
host_root: Path | None = None,
|
|
) -> None:
|
|
self.port = port
|
|
self.network = network
|
|
self.image = image
|
|
self._repo_root = repo_root
|
|
self._host_root = host_root or bot_bottle_root()
|
|
|
|
@property
|
|
def url(self) -> str:
|
|
"""Host-side control-plane URL (published loopback port)."""
|
|
return f"http://127.0.0.1:{self.port}"
|
|
|
|
@property
|
|
def internal_url(self) -> str:
|
|
"""Control-plane URL as the gateway container reaches it — by name over
|
|
docker DNS on the shared network. This is the gateway's
|
|
BOT_BOTTLE_ORCHESTRATOR_URL."""
|
|
return f"http://{ORCHESTRATOR_NAME}:{self.port}"
|
|
|
|
def is_healthy(self, *, timeout: float = _HEALTH_REQUEST_TIMEOUT_SECONDS) -> bool:
|
|
try:
|
|
with urllib.request.urlopen(f"{self.url}/health", timeout=timeout) as resp:
|
|
return resp.status == 200
|
|
except (urllib.error.URLError, TimeoutError, OSError):
|
|
return False
|
|
|
|
def _container_running(self, name: str) -> bool:
|
|
proc = run_docker(["docker", "ps", "--filter", f"name=^/{name}$", "--format", "{{.Names}}"])
|
|
return name in proc.stdout.split()
|
|
|
|
def _run_orchestrator_container(self) -> None:
|
|
"""Start the control-plane container (idempotent: clears a stale
|
|
fixed-name container first). Register-only broker → no docker socket."""
|
|
run_docker(["docker", "rm", "--force", ORCHESTRATOR_NAME])
|
|
proc = run_docker([
|
|
"docker", "run", "--detach",
|
|
"--name", ORCHESTRATOR_NAME,
|
|
"--label", ORCHESTRATOR_LABEL,
|
|
"--network", self.network,
|
|
# Host CLI reaches the control plane here; bound to loopback so it
|
|
# is not exposed on the host's external interfaces.
|
|
"--publish", f"127.0.0.1:{self.port}:{self.port}",
|
|
"--volume", f"{self._repo_root}:{_APP_DIR}:ro",
|
|
"--workdir", _APP_DIR,
|
|
# Persist the registry DB on the host (sole-owner: only the
|
|
# orchestrator opens bot-bottle.db).
|
|
"--volume", f"{self._host_root}:{_ROOT_IN_CONTAINER}",
|
|
"--env", f"BOT_BOTTLE_ROOT={_ROOT_IN_CONTAINER}",
|
|
"--entrypoint", "python3",
|
|
self.image,
|
|
"-m", "bot_bottle.orchestrator",
|
|
"--host", "0.0.0.0", "--port", str(self.port), "--broker", "stub",
|
|
])
|
|
if proc.returncode != 0:
|
|
raise OrchestratorStartError(
|
|
f"orchestrator container failed to start: {proc.stderr.strip()}"
|
|
)
|
|
|
|
def _gateway(self) -> DockerGateway:
|
|
return DockerGateway(self.image, network=self.network, orchestrator_url=self.internal_url)
|
|
|
|
def ensure_running(
|
|
self, *, startup_timeout: float = DEFAULT_STARTUP_TIMEOUT_SECONDS,
|
|
) -> str:
|
|
"""Ensure the control plane + shared gateway are up; return the host
|
|
control-plane URL. Idempotent — a healthy control plane and a running
|
|
gateway are left untouched. Raises `OrchestratorStartError` on
|
|
timeout."""
|
|
gateway = self._gateway()
|
|
gateway.ensure_built() # rebuild the bundle image on a source change
|
|
gateway.ensure_running() # creates the shared network + (re)starts gateway
|
|
|
|
# Always (re)create the orchestrator container. It runs the repo's code
|
|
# bind-mounted, but the Python process loaded that code at startup and
|
|
# won't reload — so reusing a healthy-but-stale container would keep
|
|
# running OLD control-plane code (e.g. dropping the tokens field). Cheap
|
|
# (~seconds); the registry DB persists and the current launch
|
|
# re-registers its own in-memory state. (The dedicated orchestrator
|
|
# image follow-up replaces this with image-staleness detection.)
|
|
log.info("starting orchestrator container", context={"name": ORCHESTRATOR_NAME})
|
|
self._run_orchestrator_container()
|
|
|
|
deadline = time.monotonic() + startup_timeout
|
|
while time.monotonic() < deadline:
|
|
if self.is_healthy():
|
|
log.info("orchestrator healthy", context={"url": self.url})
|
|
return self.url
|
|
time.sleep(_HEALTH_POLL_SECONDS)
|
|
raise OrchestratorStartError(
|
|
f"orchestrator at {self.url} did not become healthy within {startup_timeout:g}s"
|
|
)
|
|
|
|
def stop(self) -> None:
|
|
"""Remove the orchestrator + gateway containers (idempotent)."""
|
|
run_docker(["docker", "rm", "--force", ORCHESTRATOR_NAME])
|
|
self._gateway().stop()
|
|
|
|
|
|
__all__ = [
|
|
"OrchestratorService",
|
|
"OrchestratorStartError",
|
|
"ORCHESTRATOR_NAME",
|
|
"DEFAULT_PORT",
|
|
"DEFAULT_STARTUP_TIMEOUT_SECONDS",
|
|
]
|