mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-24 16:54:43 +00:00
Replace REST-based Discord liveness probe with local WebSocket/heartbeat state detection. REST success doesn't prove Gateway event delivery — a half-closed WebSocket can leave Bot.start() alive while REST returns 200. Now samples ready/open/ACK state and heartbeat latency; consecutive unhealthy samples emit one retryable fatal code so GatewayRunner rebuilds the adapter through the existing reconnect path. Also fixes three lifecycle gaps in the recovery path: 1. asyncio.wait_for() can remain blocked if adapter cleanup swallows cancellation — now uses bounded asyncio.wait() with task detachment. 2. Multiplexed secondary-profile adapters had no profile-scoped reconnect owner — now uses one runner-owned reconnect slot per profile. 3. An in-flight turn could send its final text through the disconnected adapter after a replacement was registered — now resolves the live same-profile replacement for unsent final responses only (message IDs never migrate, edits/deletes stay on the old transport). Adds an opt-in Linux/systemd event-loop watchdog (gateway.systemd_watchdog_seconds, default 0) for the failure mode where the whole asyncio loop stops making progress and no in-process liveness task can run. stdlib-only sd_notify, Type=notify/WatchdogSec generation, READY/STOPPING lifecycle. Co-authored-by: 王鑫 <wx.xw@bytedance.com>
176 lines
6.4 KiB
Python
176 lines
6.4 KiB
Python
"""Regression tests: the shutdown teardown loop must not hang on a wedged adapter.
|
|
|
|
`GatewayRunner._stop_impl()` tears down every adapter by awaiting
|
|
`cancel_background_tasks()` then `disconnect()`. Both calls can block
|
|
indefinitely when a platform's network state is half-dead (e.g. a wedged
|
|
Feishu/Lark WebSocket thread waiting on I/O). An unbounded await stalls the
|
|
whole shutdown past systemd's TimeoutStopSec; the resulting SIGKILL skips
|
|
atexit PID-file cleanup, so the next start dies with "PID file race lost"
|
|
(#14128).
|
|
|
|
The fix routes both teardown loops through `_bounded_adapter_teardown`,
|
|
which wraps each await in the existing per-adapter timeout budget
|
|
(HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT) and always returns.
|
|
"""
|
|
|
|
import asyncio
|
|
import logging
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.run import GatewayRunner
|
|
|
|
|
|
@pytest.fixture
|
|
def bare_runner():
|
|
"""A GatewayRunner shell that only needs _bounded_adapter_teardown."""
|
|
return object.__new__(GatewayRunner)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_calls_both_methods(bare_runner):
|
|
"""The helper cancels background tasks AND disconnects, in that order."""
|
|
calls = []
|
|
adapter = MagicMock()
|
|
adapter.cancel_background_tasks = AsyncMock(
|
|
side_effect=lambda: calls.append("cancel")
|
|
)
|
|
adapter.disconnect = AsyncMock(side_effect=lambda: calls.append("disconnect"))
|
|
|
|
await bare_runner._bounded_adapter_teardown(adapter, Platform.TELEGRAM)
|
|
|
|
adapter.cancel_background_tasks.assert_awaited_once()
|
|
adapter.disconnect.assert_awaited_once()
|
|
assert calls == ["cancel", "disconnect"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_bounds_hanging_disconnect(bare_runner, monkeypatch, caplog):
|
|
"""A wedged disconnect() must time out instead of hanging the loop."""
|
|
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0.01")
|
|
adapter = MagicMock()
|
|
adapter.cancel_background_tasks = AsyncMock(return_value=None)
|
|
|
|
async def hang():
|
|
await asyncio.sleep(60)
|
|
|
|
adapter.disconnect = AsyncMock(side_effect=hang)
|
|
|
|
with caplog.at_level(logging.WARNING, logger="gateway.run"):
|
|
await asyncio.wait_for(
|
|
bare_runner._bounded_adapter_teardown(adapter, Platform.FEISHU),
|
|
timeout=5.0, # the helper itself must return well under this
|
|
)
|
|
|
|
adapter.disconnect.assert_awaited_once()
|
|
assert "feishu disconnect timed out" in caplog.text
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_bounds_hanging_cancel(bare_runner, monkeypatch, caplog):
|
|
"""A wedged cancel_background_tasks() must time out, then disconnect runs."""
|
|
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0.01")
|
|
adapter = MagicMock()
|
|
|
|
async def hang():
|
|
await asyncio.sleep(60)
|
|
|
|
adapter.cancel_background_tasks = AsyncMock(side_effect=hang)
|
|
adapter.disconnect = AsyncMock(return_value=None)
|
|
|
|
with caplog.at_level(logging.WARNING, logger="gateway.run"):
|
|
await asyncio.wait_for(
|
|
bare_runner._bounded_adapter_teardown(adapter, Platform.FEISHU),
|
|
timeout=5.0,
|
|
)
|
|
|
|
assert "feishu background-task cancel timed out" in caplog.text
|
|
# disconnect still attempted after the cancel timeout — forward progress.
|
|
adapter.disconnect.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_continues_after_cancellation_swallowing_background_cancel(
|
|
bare_runner, monkeypatch, caplog
|
|
):
|
|
"""A stuck cancellation handler cannot prevent adapter disconnect.
|
|
|
|
This models a platform task that catches ``CancelledError`` while it is
|
|
unwinding. The teardown deadline must release runner ownership promptly,
|
|
then proceed to disconnect instead of waiting for that old task forever.
|
|
"""
|
|
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0.01")
|
|
adapter = MagicMock()
|
|
started = asyncio.Event()
|
|
release = asyncio.Event()
|
|
finished = asyncio.Event()
|
|
|
|
async def swallow_cancellation():
|
|
started.set()
|
|
while not release.is_set():
|
|
try:
|
|
await release.wait()
|
|
except asyncio.CancelledError:
|
|
continue
|
|
finished.set()
|
|
|
|
adapter.cancel_background_tasks = AsyncMock(side_effect=swallow_cancellation)
|
|
adapter.disconnect = AsyncMock(return_value=None)
|
|
operation = asyncio.create_task(
|
|
bare_runner._bounded_adapter_teardown(adapter, Platform.FEISHU)
|
|
)
|
|
await started.wait()
|
|
done, _pending = await asyncio.wait({operation}, timeout=0.2)
|
|
try:
|
|
assert operation in done
|
|
adapter.disconnect.assert_awaited_once()
|
|
assert "feishu background-task cancel timed out" in caplog.text
|
|
finally:
|
|
release.set()
|
|
await asyncio.wait({operation}, timeout=0.2)
|
|
await asyncio.wait_for(finished.wait(), timeout=0.2)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_swallows_exceptions(bare_runner):
|
|
"""Errors in either await must not propagate — shutdown continues."""
|
|
adapter = MagicMock()
|
|
adapter.cancel_background_tasks = AsyncMock(side_effect=RuntimeError("bg"))
|
|
adapter.disconnect = AsyncMock(side_effect=RuntimeError("disc"))
|
|
|
|
# Must NOT raise.
|
|
await bare_runner._bounded_adapter_teardown(adapter, Platform.TELEGRAM)
|
|
|
|
adapter.cancel_background_tasks.assert_awaited_once()
|
|
adapter.disconnect.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_profile_suffix_in_logs(bare_runner, caplog):
|
|
"""Multiplex (secondary-profile) teardown tags log lines with the profile."""
|
|
adapter = MagicMock()
|
|
adapter.cancel_background_tasks = AsyncMock(return_value=None)
|
|
adapter.disconnect = AsyncMock(return_value=None)
|
|
|
|
with caplog.at_level(logging.INFO, logger="gateway.run"):
|
|
await bare_runner._bounded_adapter_teardown(
|
|
adapter, Platform.TELEGRAM, profile="acct2"
|
|
)
|
|
|
|
assert "(profile: acct2)" in caplog.text
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_teardown_timeout_zero_disables_bound(bare_runner, monkeypatch):
|
|
"""timeout=0 disables the wait_for wrapper but still calls through."""
|
|
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0")
|
|
adapter = MagicMock()
|
|
adapter.cancel_background_tasks = AsyncMock(return_value=None)
|
|
adapter.disconnect = AsyncMock(return_value=None)
|
|
|
|
await bare_runner._bounded_adapter_teardown(adapter, Platform.TELEGRAM)
|
|
|
|
adapter.cancel_background_tasks.assert_awaited_once()
|
|
adapter.disconnect.assert_awaited_once()
|