fix(stability): stage 6 review round 1 — /ping degrades to pure connectivity when watchdog disabled
Review finding (low, real): the comment claimed /ping degenerates to a pure connectivity check when TG_WATCHDOG_ENABLED=false, but _wd_last_ok_monotonic is also stamped by _restart_client (on the disconnect-flap path, which runs before the watchdog-enabled gate), so with the watchdog off one flap sets age and nothing ever refreshes it — age grows unbounded past the threshold and /ping returns 503 on a live connection, spuriously failing the container healthcheck and triggering an autoheal restart after every flap. Fix: gate the staleness branch on the watchdog being enabled — healthy = connected and (not Config["tg_watchdog_enabled"] or age is None or age < threshold) so with the watchdog disabled /ping is a pure connectivity check (matching the intent), and correct the comment to note a flap-restart can stamp age even when the watchdog is off. New test test_ping_watchdog_disabled_stale_age_still_healthy: watchdog off + connected + stale age => 200 ok. Adversarially validated — reverting the gate reds the new test (503) while the watchdog-ON stale-probe test stays green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
+12
-4
@@ -1083,10 +1083,18 @@ async def ping() -> JSONResponse:
|
||||
# age is None right after boot: the watchdog hasn't run its first probe yet. Treat that
|
||||
# as healthy (gate on connected only) so a freshly-started container is not killed before
|
||||
# its first probe cycle — otherwise start_period would have to cover a full watchdog interval.
|
||||
# Note: when the watchdog is DISABLED (TG_WATCHDOG_ENABLED=false) age stays None forever,
|
||||
# so /ping degenerates to a pure connectivity check and cannot detect a stale-but-connected
|
||||
# ("zombie") session — that TG-liveness signal only exists while the watchdog runs.
|
||||
healthy = connected and (age is None or age < threshold)
|
||||
#
|
||||
# The staleness branch (age >= threshold => degraded) is only meaningful while the watchdog
|
||||
# is running to refresh age. With the watchdog DISABLED (TG_WATCHDOG_ENABLED=false) nothing
|
||||
# refreshes age — yet a disconnect-flap restart can still stamp it once (see _restart_client,
|
||||
# which runs before the watchdog-enabled gate), after which age only grows. Letting that
|
||||
# stale age drive /ping to 503 would spuriously fail the container healthcheck on a live
|
||||
# connection and trigger an autoheal restart. So gate staleness on the watchdog being on;
|
||||
# with it off, /ping is a pure connectivity check (no zombie-session detection — that
|
||||
# TG-liveness signal only exists while the watchdog runs).
|
||||
healthy = connected and (
|
||||
not Config["tg_watchdog_enabled"] or age is None or age < threshold
|
||||
)
|
||||
return JSONResponse(
|
||||
{
|
||||
"status": "ok" if healthy else "degraded",
|
||||
|
||||
Reference in New Issue
Block a user