didericis
d7a58e52fd
lint / lint (push) Successful in 54s
test / integration-docker (pull_request) Successful in 38s
test / unit (pull_request) Successful in 45s
test / integration-firecracker (pull_request) Successful in 3m31s
test / coverage (pull_request) Successful in 18s
test / publish-infra (pull_request) Has been skipped
tracker-policy-pr / check-pr (pull_request) Failing after 6s
Move the DbStore base (db_store), the shared schema-migration base (migrations / TableMigrations), the concrete stores (audit_store, config_store, queue_store), and StoreManager out of the package root into a bot_bottle/store/ package, so persistence lives in one place rather than scattered across the root. Callers use direct submodule imports (from bot_bottle.store.store_manager import StoreManager). Inside the moved modules the relative imports point back up to their non-store siblings (..paths, ..supervise_types) while co-moved siblings stay package-local; the flat-import fallbacks are untouched. The orchestrator's own stores (config_store, secret_store, registry) stay in orchestrator/ and repoint to the moved DbStore / TableMigrations. No behavior change; full unit suite green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
108 lines
3.4 KiB
Python
108 lines
3.4 KiB
Python
"""Per-host orchestrator configuration store (settings in bot-bottle.db).
|
|
|
|
Co-tenants the shared `bot-bottle.db` via the `DbStore` framework. Settings
|
|
are readable by the host launch path directly (no HTTP round-trip to the
|
|
orchestrator), so they take effect even before the orchestrator is reachable.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import sqlite3
|
|
from pathlib import Path
|
|
|
|
from ..store.db_store import DbStore
|
|
from ..store.migrations import TableMigrations
|
|
from ..paths import host_db_path
|
|
|
|
TEARDOWN_TIMEOUT_ENV = "BOT_BOTTLE_ORCHESTRATOR_TEARDOWN_TIMEOUT_SECONDS"
|
|
DEFAULT_TEARDOWN_TIMEOUT_SECONDS = 30.0
|
|
|
|
_MIGRATIONS = TableMigrations(
|
|
"orchestrator_config",
|
|
[
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS orchestrator_config (
|
|
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
teardown_timeout_seconds REAL
|
|
)
|
|
""",
|
|
],
|
|
)
|
|
|
|
|
|
class OrchestratorConfigStore(DbStore):
|
|
"""Orchestrator settings in the shared host DB."""
|
|
|
|
def __init__(self, db_path: Path | None = None) -> None:
|
|
super().__init__(db_path or host_db_path(), _MIGRATIONS)
|
|
|
|
def _connect(self) -> sqlite3.Connection:
|
|
conn = super()._connect()
|
|
conn.execute("PRAGMA busy_timeout=5000")
|
|
return conn
|
|
|
|
def get_teardown_timeout_seconds(self) -> float | None:
|
|
"""Return the configured teardown timeout, or None if not set."""
|
|
try:
|
|
with self._connection() as conn:
|
|
row = conn.execute(
|
|
"SELECT teardown_timeout_seconds FROM orchestrator_config WHERE id = 1"
|
|
).fetchone()
|
|
except sqlite3.OperationalError:
|
|
return None
|
|
return row["teardown_timeout_seconds"] if row else None
|
|
|
|
def set_teardown_timeout_seconds(self, value: float) -> None:
|
|
"""Persist the teardown timeout."""
|
|
with self._connection() as conn:
|
|
conn.execute(
|
|
"INSERT OR REPLACE INTO orchestrator_config"
|
|
" (id, teardown_timeout_seconds) VALUES (1, ?)",
|
|
(value,),
|
|
)
|
|
self._chmod()
|
|
|
|
def delete_teardown_timeout_seconds(self) -> bool:
|
|
"""Clear the stored teardown timeout. Returns True if a value existed."""
|
|
with self._connection() as conn:
|
|
cur = conn.execute(
|
|
"UPDATE orchestrator_config SET teardown_timeout_seconds = NULL"
|
|
" WHERE id = 1 AND teardown_timeout_seconds IS NOT NULL"
|
|
)
|
|
return cur.rowcount > 0
|
|
|
|
|
|
def resolve_teardown_timeout(db_path: Path | None = None) -> float:
|
|
"""Return the teardown timeout to use, in priority order:
|
|
|
|
1. ``BOT_BOTTLE_ORCHESTRATOR_TEARDOWN_TIMEOUT_SECONDS`` env var
|
|
2. ``teardown_timeout_seconds`` in the orchestrator config DB
|
|
3. ``DEFAULT_TEARDOWN_TIMEOUT_SECONDS`` (30 s)
|
|
"""
|
|
raw = os.environ.get(TEARDOWN_TIMEOUT_ENV, "").strip()
|
|
if raw:
|
|
try:
|
|
value = float(raw)
|
|
if value > 0:
|
|
return value
|
|
except ValueError:
|
|
pass
|
|
|
|
store = OrchestratorConfigStore(db_path)
|
|
if not store.is_migrated():
|
|
store.migrate()
|
|
db_value = store.get_teardown_timeout_seconds()
|
|
if db_value is not None and db_value > 0:
|
|
return db_value
|
|
|
|
return DEFAULT_TEARDOWN_TIMEOUT_SECONDS
|
|
|
|
|
|
__all__ = [
|
|
"OrchestratorConfigStore",
|
|
"resolve_teardown_timeout",
|
|
"TEARDOWN_TIMEOUT_ENV",
|
|
"DEFAULT_TEARDOWN_TIMEOUT_SECONDS",
|
|
]
|