Skip to content

fix(a2a): honor configured reply timeout in watchdog #100312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rtx9jckz2g-prog wants to merge 1 commit into from
Closed

fix(a2a): honor configured reply timeout in watchdog #100312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions plugins/platforms/a2a/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
logger = logging.getLogger(__name__)

_DEFAULT_PORT = 9900
_ORPHAN_TIMEOUT = 300 # seconds before a pending task is considered orphaned
_MIN_ORPHAN_TIMEOUT = 300 # preserve the existing five-minute floor
_WATCHDOG_INTERVAL = 60 # seconds between orphaned task watchdog runs
_MAX_BODY = 1_048_576 # 1MB max request body — prevents DoS via memory exhaustion
_SSE_KEEPALIVE = 5 # seconds between SSE keepalive comments
Expand All @@ -74,6 +74,16 @@ def _reply_timeout() -> float:
return 300.0


def _orphan_timeout() -> float:
"""Keep pending tasks alive through the configured reply deadline.

The watchdog runs independently from request waiters, so add one watchdog
interval of grace. Otherwise a reply timeout above five minutes is
ineffective because the task is marked failed at the old fixed deadline.
"""
return max(float(_MIN_ORPHAN_TIMEOUT), _reply_timeout() + _WATCHDOG_INTERVAL)


def _default_agent_name() -> str:
name = os.getenv("A2A_AGENT_NAME", "").strip()
if name:
Expand Down Expand Up @@ -473,8 +483,9 @@ def _watchdog_loop(self) -> None:
"""Background thread that fails orphaned tasks (keeps them queryable)."""
while not self._watchdog_stop.wait(_WATCHDOG_INTERVAL):
try:
for tid in self.tasks.fail_orphans(_ORPHAN_TIMEOUT):
logger.warning("A2A: orphaned task %s marked failed (timeout %ds)", tid, _ORPHAN_TIMEOUT)
orphan_timeout = _orphan_timeout()
for tid in self.tasks.fail_orphans(orphan_timeout):
logger.warning("A2A: orphaned task %s marked failed (timeout %.0fs)", tid, orphan_timeout)
protocol.metrics.tasks_failed += 1
except Exception:
logger.debug("A2A: watchdog error", exc_info=True)
Expand Down
20 changes: 20 additions & 0 deletions tests/plugins/test_a2a_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,26 @@ def _free_port() -> int:
return port


# --------------------------------------------------------------------------
# Timeouts
# --------------------------------------------------------------------------

class TestA2ATimeouts:
def test_orphan_timeout_never_preempts_configured_reply_timeout(self, monkeypatch):
from plugins.platforms.a2a import adapter

monkeypatch.setenv("A2A_REPLY_TIMEOUT", "900")
assert adapter._orphan_timeout() >= (
adapter._reply_timeout() + adapter._WATCHDOG_INTERVAL
)

def test_orphan_timeout_keeps_existing_five_minute_floor(self, monkeypatch):
from plugins.platforms.a2a import adapter

monkeypatch.setenv("A2A_REPLY_TIMEOUT", "1")
assert adapter._orphan_timeout() >= adapter._MIN_ORPHAN_TIMEOUT


# --------------------------------------------------------------------------
# Security
# --------------------------------------------------------------------------
Expand Down