mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
Follow-up to the salvaged #69164 commits: policy forbids introducing new HERMES_* environment variables, so the four watchdog env knobs (HERMES_GATEWAY_LOOP_WATCHDOG / _INTERVAL / _TIMEOUT / _STRIKES) are replaced with a single config.yaml boolean: gateway: loop_watchdog: true # default; false disables both guards - gateway/config.py: new GatewayConfig.loop_watchdog field (default True), parsed from top-level or nested gateway: form, round-trips via to_dict/from_dict. - gateway/run.py: _start_loop_liveness_guards() checks config.loop_watchdog before arming the floor timer + watchdog (getattr-guarded for bare object.__new__ runners). - gateway/shutdown_watchdog.py: start_loop_liveness_watchdog() no longer reads the environment; probe interval/timeout/strikes are module constants (30s/10s/3 — ~90s to restart, matching the systemd watchdog layer's posture). - hermes_cli/config.py: documented gateway.loop_watchdog default so 'hermes config set gateway.loop_watchdog false' validates. - tests: env-knob tests replaced with config-gate + round-trip tests; the final-strike boundary test injects its probe via max_strikes directly instead of patching the removed env helper.
429 lines
15 KiB
Python
429 lines
15 KiB
Python
"""Out-of-loop shutdown and event-loop liveness backstops (#66892, #69089).
|
|
|
|
When the asyncio loop freezes mid-drain, every asyncio-based recovery path is
|
|
structurally unable to fire: the drain deadline, status rewrites, and forensics
|
|
all need the same loop that is stuck. launchd/systemd KeepAlive only restarts a
|
|
*dead* process, so a wedged-but-alive gateway sits as a zombie until manual
|
|
SIGKILL.
|
|
|
|
This module provides:
|
|
|
|
1. A plain OS-thread shutdown watchdog armed at ``stop()``. If shutdown has not
|
|
completed within ``restart_drain_timeout + grace``, it dumps all-thread
|
|
stacks via ``faulthandler`` plus a metadata snapshot, then ``os._exit`` so
|
|
the service manager can revive the process.
|
|
2. An event-loop heartbeat file at ``<HERMES_HOME>/state/gateway.heartbeat`` so
|
|
external supervision can distinguish "process alive" from "loop frozen"
|
|
(``gateway_state.json`` alone can't — it only rewrites on transitions/turns).
|
|
3. A lifetime thread watchdog that can still diagnose and hard-exit when the
|
|
event loop is too frozen to run its own heartbeat or timeout callbacks.
|
|
4. A self-rescheduling floor timer that keeps the loop selector's timeout
|
|
finite, giving existing async recovery tasks a chance to resume.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import faulthandler
|
|
import json
|
|
import logging
|
|
import os
|
|
import sys
|
|
import threading
|
|
import time
|
|
from datetime import datetime, timezone
|
|
from pathlib import Path
|
|
from typing import Any, Callable, Dict, Optional
|
|
|
|
from gateway.restart import GATEWAY_SERVICE_RESTART_EXIT_CODE
|
|
from hermes_constants import get_hermes_home
|
|
from utils import atomic_json_write
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Extra leash beyond ``agent.restart_drain_timeout`` so a slow-but-progressing
|
|
# drain is not cut short. Matches the issue #66892 suggested hardening.
|
|
DEFAULT_SHUTDOWN_WATCHDOG_GRACE_S = 60.0
|
|
DEFAULT_HEARTBEAT_INTERVAL_S = 30.0
|
|
DEFAULT_LOOP_FLOOR_TIMER_INTERVAL_S = 5.0
|
|
DEFAULT_LOOP_WATCHDOG_INTERVAL_S = 30.0
|
|
DEFAULT_LOOP_WATCHDOG_TIMEOUT_S = 10.0
|
|
DEFAULT_LOOP_WATCHDOG_MAX_STRIKES = 3
|
|
_HEARTBEAT_RELATIVE = ("state", "gateway.heartbeat")
|
|
_WATCHDOG_DUMP_RELATIVE = ("logs", "gateway-shutdown-watchdog.log")
|
|
|
|
|
|
class _LoopFloorTimerHandle:
|
|
"""Cancelable owner for the currently scheduled selector floor timer."""
|
|
|
|
def __init__(self, loop: asyncio.AbstractEventLoop, interval: float):
|
|
self._loop = loop
|
|
self._interval = interval
|
|
self._cancelled = False
|
|
self._timer: Optional[asyncio.TimerHandle] = None
|
|
self._schedule()
|
|
|
|
def _schedule(self) -> None:
|
|
self._timer = self._loop.call_later(self._interval, self._tick)
|
|
|
|
def _tick(self) -> None:
|
|
if not self._cancelled:
|
|
self._schedule()
|
|
|
|
def cancel(self) -> None:
|
|
self._cancelled = True
|
|
if self._timer is not None:
|
|
self._timer.cancel()
|
|
|
|
|
|
class _LoopLivenessWatchdogHandle:
|
|
"""Small lifecycle handle for the daemon liveness thread."""
|
|
|
|
def __init__(self, stop_event: threading.Event, thread: threading.Thread):
|
|
self._stop_event = stop_event
|
|
self._thread = thread
|
|
|
|
def stop(self) -> None:
|
|
self._stop_event.set()
|
|
|
|
def join(self, timeout: Optional[float] = None) -> None:
|
|
self._thread.join(timeout=timeout)
|
|
|
|
def is_alive(self) -> bool:
|
|
return self._thread.is_alive()
|
|
|
|
|
|
def _arm_loop_floor_timer(
|
|
loop: asyncio.AbstractEventLoop,
|
|
interval: float = DEFAULT_LOOP_FLOOR_TIMER_INTERVAL_S,
|
|
) -> _LoopFloorTimerHandle:
|
|
"""Keep at least one timer pending so selector waits remain bounded."""
|
|
try:
|
|
resolved_interval = float(interval)
|
|
if resolved_interval <= 0:
|
|
raise ValueError
|
|
except (TypeError, ValueError):
|
|
resolved_interval = DEFAULT_LOOP_FLOOR_TIMER_INTERVAL_S
|
|
return _LoopFloorTimerHandle(loop, resolved_interval)
|
|
|
|
|
|
def start_loop_liveness_watchdog(
|
|
loop: asyncio.AbstractEventLoop,
|
|
*,
|
|
probe_interval: float = DEFAULT_LOOP_WATCHDOG_INTERVAL_S,
|
|
probe_timeout: float = DEFAULT_LOOP_WATCHDOG_TIMEOUT_S,
|
|
max_strikes: int = DEFAULT_LOOP_WATCHDOG_MAX_STRIKES,
|
|
exit_code: int = GATEWAY_SERVICE_RESTART_EXIT_CODE,
|
|
) -> Optional[_LoopLivenessWatchdogHandle]:
|
|
"""Start an out-of-loop watchdog that hard-exits after missed probes.
|
|
|
|
The guard is on by default; operators opt out with
|
|
``gateway.loop_watchdog: false`` in config.yaml (enforced by the caller,
|
|
``GatewayRunner._start_loop_liveness_guards`` — this module stays
|
|
config-agnostic so bare-loop tests can drive it directly).
|
|
"""
|
|
interval = probe_interval
|
|
timeout = probe_timeout
|
|
strikes_limit = max_strikes
|
|
stop_event = threading.Event()
|
|
|
|
def _wait_for_probe(probe_event: threading.Event) -> Optional[bool]:
|
|
deadline = time.monotonic() + timeout
|
|
while True:
|
|
if stop_event.is_set():
|
|
return None
|
|
remaining = deadline - time.monotonic()
|
|
if remaining <= 0:
|
|
return probe_event.is_set()
|
|
if probe_event.wait(timeout=min(remaining, 0.05)):
|
|
return True
|
|
|
|
def _watchdog() -> None:
|
|
strikes = 0
|
|
while not stop_event.wait(timeout=interval):
|
|
probe_event = threading.Event()
|
|
try:
|
|
loop.call_soon_threadsafe(probe_event.set)
|
|
except RuntimeError:
|
|
# A normally closed loop cannot be probed and no longer needs
|
|
# a process-liveness backstop.
|
|
return
|
|
except Exception:
|
|
logger.debug(
|
|
"Failed to schedule gateway loop liveness probe", exc_info=True
|
|
)
|
|
return
|
|
|
|
responded = _wait_for_probe(probe_event)
|
|
if responded is None:
|
|
return
|
|
if responded:
|
|
strikes = 0
|
|
continue
|
|
|
|
if stop_event.is_set():
|
|
return
|
|
strikes += 1
|
|
if strikes < strikes_limit:
|
|
continue
|
|
|
|
if stop_event.is_set():
|
|
return
|
|
try:
|
|
logger.critical(
|
|
"Gateway event loop missed %d consecutive liveness probes; "
|
|
"dumping all thread stacks and exiting with code %d so the "
|
|
"service supervisor can restart it.",
|
|
strikes,
|
|
exit_code,
|
|
)
|
|
except Exception:
|
|
pass
|
|
try:
|
|
faulthandler.dump_traceback(all_threads=True)
|
|
except Exception:
|
|
logger.debug("Loop liveness faulthandler dump failed", exc_info=True)
|
|
if stop_event.is_set():
|
|
return
|
|
os._exit(exit_code)
|
|
return
|
|
|
|
thread = threading.Thread(
|
|
target=_watchdog,
|
|
daemon=True,
|
|
name="gateway-loop-liveness-watchdog",
|
|
)
|
|
try:
|
|
thread.start()
|
|
except Exception:
|
|
logger.debug("Failed to start gateway loop liveness watchdog", exc_info=True)
|
|
return None
|
|
return _LoopLivenessWatchdogHandle(stop_event, thread)
|
|
|
|
|
|
def _process_hermes_home() -> Path:
|
|
"""HERMES_HOME for process-level identity files (ignore profile overrides)."""
|
|
val = os.environ.get("HERMES_HOME", "").strip()
|
|
if val:
|
|
return Path(val)
|
|
return get_hermes_home()
|
|
|
|
|
|
def get_loop_heartbeat_path(home: Optional[Path] = None) -> Path:
|
|
"""Return ``<HERMES_HOME>/state/gateway.heartbeat``."""
|
|
base = home if home is not None else _process_hermes_home()
|
|
return base.joinpath(*_HEARTBEAT_RELATIVE)
|
|
|
|
|
|
def get_shutdown_watchdog_dump_path(home: Optional[Path] = None) -> Path:
|
|
"""Return the faulthandler / metadata dump path for a fired watchdog."""
|
|
base = home if home is not None else _process_hermes_home()
|
|
return base.joinpath(*_WATCHDOG_DUMP_RELATIVE)
|
|
|
|
|
|
def write_loop_heartbeat(
|
|
*,
|
|
pid: Optional[int] = None,
|
|
start_time: Optional[float] = None,
|
|
home: Optional[Path] = None,
|
|
extra: Optional[Dict[str, Any]] = None,
|
|
) -> Path:
|
|
"""Atomically rewrite the loop-liveness heartbeat file.
|
|
|
|
``start_time`` is the gateway process start (``time.time()`` epoch seconds)
|
|
so supervisors can detect PID reuse. Best-effort — never raises.
|
|
"""
|
|
path = get_loop_heartbeat_path(home)
|
|
payload: Dict[str, Any] = {
|
|
"pid": int(pid if pid is not None else os.getpid()),
|
|
"updated_at": datetime.now(timezone.utc).isoformat(),
|
|
"monotonic": time.monotonic(),
|
|
}
|
|
if start_time is not None:
|
|
payload["start_time"] = float(start_time)
|
|
if extra:
|
|
payload.update(extra)
|
|
try:
|
|
atomic_json_write(path, payload, indent=None)
|
|
except Exception:
|
|
logger.debug("Failed to write gateway loop heartbeat", exc_info=True)
|
|
return path
|
|
|
|
|
|
def resolve_shutdown_watchdog_delay(
|
|
drain_timeout: float,
|
|
*,
|
|
grace_s: float = DEFAULT_SHUTDOWN_WATCHDOG_GRACE_S,
|
|
) -> float:
|
|
"""Return the wall-clock leash for the shutdown watchdog thread."""
|
|
try:
|
|
drain = max(float(drain_timeout), 0.0)
|
|
except (TypeError, ValueError):
|
|
drain = 0.0
|
|
try:
|
|
grace = max(float(grace_s), 0.0)
|
|
except (TypeError, ValueError):
|
|
grace = DEFAULT_SHUTDOWN_WATCHDOG_GRACE_S
|
|
return drain + grace
|
|
|
|
|
|
def _write_watchdog_dump(
|
|
dump_path: Path,
|
|
*,
|
|
delay_s: float,
|
|
snapshot: Optional[Dict[str, Any]],
|
|
) -> None:
|
|
"""Best-effort faulthandler + metadata dump before hard-exit."""
|
|
try:
|
|
dump_path.parent.mkdir(parents=True, exist_ok=True)
|
|
except OSError:
|
|
return
|
|
|
|
header = {
|
|
"event": "shutdown_watchdog_fired",
|
|
"pid": os.getpid(),
|
|
"delay_s": delay_s,
|
|
"fired_at": datetime.now(timezone.utc).isoformat(),
|
|
"snapshot": snapshot or {},
|
|
}
|
|
try:
|
|
with open(dump_path, "a", encoding="utf-8") as fh:
|
|
fh.write(json.dumps(header, default=str) + "\n")
|
|
fh.write("--- faulthandler dump (all threads) ---\n")
|
|
fh.flush()
|
|
try:
|
|
faulthandler.dump_traceback(file=fh, all_threads=True)
|
|
except Exception:
|
|
fh.write("(faulthandler.dump_traceback failed)\n")
|
|
fh.write("--- end dump ---\n")
|
|
fh.flush()
|
|
except Exception:
|
|
pass
|
|
|
|
# Also dump to stderr so journald/launchd capture it even if the file
|
|
# write failed (wedged disk was one of the #66892 hypotheses).
|
|
try:
|
|
sys.stderr.write(
|
|
f"Gateway shutdown watchdog fired after {delay_s:.0f}s "
|
|
f"(pid={os.getpid()}); dumping all thread stacks.\n"
|
|
)
|
|
sys.stderr.flush()
|
|
faulthandler.dump_traceback(all_threads=True)
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
def arm_shutdown_watchdog(
|
|
delay_s: float,
|
|
*,
|
|
done_event: Optional[threading.Event] = None,
|
|
snapshot_fn: Optional[Callable[[], Dict[str, Any]]] = None,
|
|
exit_code: int = 1,
|
|
dump_path: Optional[Path] = None,
|
|
name: str = "gateway-shutdown-watchdog",
|
|
) -> threading.Event:
|
|
"""Arm a daemon-thread hard-exit backstop for a wedged shutdown path.
|
|
|
|
If ``done_event`` is set before ``delay_s`` elapses, the thread exits
|
|
quietly (normal / progressing shutdown completed). Otherwise it dumps
|
|
diagnostics and calls ``os._exit(exit_code)``.
|
|
|
|
Never raises. Returns the ``done_event`` (creating one when omitted) so
|
|
the caller can disarm on successful completion.
|
|
"""
|
|
done = done_event if done_event is not None else threading.Event()
|
|
try:
|
|
delay = max(float(delay_s), 0.0)
|
|
except (TypeError, ValueError):
|
|
delay = DEFAULT_SHUTDOWN_WATCHDOG_GRACE_S
|
|
|
|
if delay <= 0:
|
|
return done
|
|
|
|
def _watchdog() -> None:
|
|
# Wait with interruptible chunks so a late disarm doesn't need the
|
|
# full remaining sleep to observe done_event.
|
|
deadline = time.monotonic() + delay
|
|
while time.monotonic() < deadline:
|
|
remaining = deadline - time.monotonic()
|
|
if done.wait(timeout=min(remaining, 1.0)):
|
|
return
|
|
if done.is_set():
|
|
return
|
|
|
|
snapshot: Optional[Dict[str, Any]] = None
|
|
if snapshot_fn is not None:
|
|
try:
|
|
snapshot = snapshot_fn()
|
|
except Exception as exc:
|
|
snapshot = {"snapshot_error": repr(exc)}
|
|
|
|
target = dump_path if dump_path is not None else get_shutdown_watchdog_dump_path()
|
|
_write_watchdog_dump(target, delay_s=delay, snapshot=snapshot)
|
|
|
|
try:
|
|
logger.critical(
|
|
"Shutdown watchdog fired after %.0fs — forcing process exit "
|
|
"(asyncio drain path appears wedged; see %s)",
|
|
delay,
|
|
target,
|
|
)
|
|
except Exception:
|
|
pass
|
|
|
|
for stream in (sys.stdout, sys.stderr):
|
|
try:
|
|
stream.flush()
|
|
except Exception:
|
|
pass
|
|
# Mirror _exit_after_graceful_shutdown: release PID file + runtime
|
|
# lock BEFORE the log drain (locks must never be stranded), then
|
|
# drain the async log queue so the logger.critical above actually
|
|
# reaches the file before os._exit bypasses atexit. (#66892)
|
|
try:
|
|
from gateway.status import remove_pid_file, release_gateway_runtime_lock
|
|
remove_pid_file()
|
|
release_gateway_runtime_lock()
|
|
except Exception:
|
|
pass
|
|
try:
|
|
from hermes_logging import drain_log_queue
|
|
drain_log_queue(timeout=1.0)
|
|
except Exception:
|
|
pass
|
|
os._exit(exit_code)
|
|
|
|
try:
|
|
threading.Thread(target=_watchdog, daemon=True, name=name).start()
|
|
except Exception:
|
|
logger.debug("Failed to arm shutdown watchdog", exc_info=True)
|
|
return done
|
|
|
|
|
|
async def loop_heartbeat_forever(
|
|
*,
|
|
interval_s: float = DEFAULT_HEARTBEAT_INTERVAL_S,
|
|
start_time: Optional[float] = None,
|
|
home: Optional[Path] = None,
|
|
should_continue: Optional[Callable[[], bool]] = None,
|
|
) -> None:
|
|
"""Rewrite the loop heartbeat file on a cadence until cancelled / gated off.
|
|
|
|
Runs as an asyncio task on the gateway loop — if the loop freezes, this
|
|
task stops and the file mtime/updated_at goes stale for external monitors.
|
|
"""
|
|
try:
|
|
interval = max(float(interval_s), 1.0)
|
|
except (TypeError, ValueError):
|
|
interval = DEFAULT_HEARTBEAT_INTERVAL_S
|
|
|
|
# Immediate first write so monitors see a fresh file as soon as the
|
|
# gateway is running, not after the first interval.
|
|
write_loop_heartbeat(start_time=start_time, home=home)
|
|
while True:
|
|
if should_continue is not None and not should_continue():
|
|
return
|
|
await asyncio.sleep(interval)
|
|
if should_continue is not None and not should_continue():
|
|
return
|
|
write_loop_heartbeat(start_time=start_time, home=home)
|