teknium1
b531023622
The per-step leases inside maybe_auto_archive / maybe_auto_prune_and_vacuum
(archive, prune, sweep, vacuum) cover every long step of the construction-time
block, and each renews right before the step it protects, so the extra
report_startup_progress(900) at the top of GatewayRunner._init_session_db
added nothing but a stale phase label ("gateway_startup_state_maintenance"
would outlive the archive step and mask the phase name in the fired record).
Dropped; gateway/run.py is back to origin/main.
Tests: the two contributor tests monkeypatched report_startup_progress in the
module and asserted phase names (change-detectors on the strings). Replaced by
one test that arms a REAL StartupWatchdogHandle and asserts the maintenance
block renews it four times with lease_until in the future — the property the
poller's `lease_until > now` branch actually needs (#111092). Red on
origin/main: lease_count stays at the schema-init lease.
Docs: HERMES_STARTUP_WATCHDOG / HERMES_STARTUP_WATCHDOG_TIMEOUT_S existed only
in the module docstring; add them to website/docs/reference/environment-variables.md
next to the respawn-storm variables (existing env vars only, no new surface).
43 lines
1.8 KiB
Python
43 lines
1.8 KiB
Python
"""Construction-time state.db maintenance must keep the startup watchdog's progress lease alive (#111092).
|
|
|
|
Archive, prune, orphan sweep and VACUUM are I/O-bound with near-zero CPU, so the watchdog's
|
|
CPU fallback cannot tell them from a parked deadlock; only a phase lease can. Leases are
|
|
clamped to ``_MAX_LEASE_S`` per call, so each long step renews rather than one lease at entry.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
|
|
import hermes_startup_watchdog as sw
|
|
from hermes_state import SessionDB
|
|
|
|
|
|
def test_maintenance_steps_renew_the_armed_watchdog_lease(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
sw._reset_for_tests()
|
|
handle = sw.arm_startup_watchdog(timeout_s=300.0)
|
|
db = SessionDB(db_path=tmp_path / "state.db")
|
|
try:
|
|
# Maintenance is throttled by state_meta; a fresh DB has never run it.
|
|
monkeypatch.setattr(db, "prune_sessions", lambda **kw: 120) # VACUUM only runs after a real prune
|
|
monkeypatch.setattr(db, "sweep_orphaned_sessions", lambda **kw: [])
|
|
monkeypatch.setattr(db, "_freelist_ratio", lambda: 1.0)
|
|
monkeypatch.setattr(db, "vacuum", lambda: None)
|
|
monkeypatch.setattr(db, "archive_stale_sessions", lambda *a, **kw: 0)
|
|
before = handle._lease_count
|
|
|
|
db.maybe_auto_archive(idle_days=3, min_interval_hours=0)
|
|
db.maybe_auto_prune_and_vacuum(
|
|
retention_days=90, min_interval_hours=0, vacuum=True, min_vacuum_interval_days=0,
|
|
)
|
|
|
|
# One renewal per long step (archive, prune, sweep, vacuum), the last one
|
|
# taken right before VACUUM so a multi-minute rewrite never outlives the clamp.
|
|
assert handle._lease_count - before == 4
|
|
assert handle._lease_phase == "state_db_auto_vacuum"
|
|
assert handle._lease_until > time.monotonic()
|
|
finally:
|
|
db.close()
|
|
sw._reset_for_tests()
|