Skip to content

fix(server): close the event queues when ActiveTask.start() fails #1422

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

Open
cchinchilla-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(server): close the event queues when ActiveTask.start() fails #1422

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
2 changes: 2 additions & 0 deletions src/a2a/server/agent_execution/active_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,8 @@ async def start(
self._task_id,
)
self._is_finished.set()
await self._event_queue_agent.close(immediate=True)
await self._event_queue_subscribers.close(immediate=True)
if self._reference_count == 0 and self._on_cleanup:
self._on_cleanup(self)
raise
Expand Down
45 changes: 44 additions & 1 deletion tests/server/agent_execution/test_active_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
TaskStatusUpdateEvent,
)
from a2a.utils._async_queue_compat import QueueShutDown, create_async_queue
from a2a.utils.errors import UnsupportedOperationError
from a2a.utils.errors import TaskNotFoundError, UnsupportedOperationError


logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -1445,3 +1445,46 @@ async def slow_execute(req, q):
for t in background:
t.cancel()
await asyncio.gather(*background, return_exceptions=True)


@pytest.mark.timeout(5)
@pytest.mark.asyncio
@pytest.mark.parametrize(
('stored_task', 'expected_error'),
[
(
Task(
id='test-task-id',
status=TaskStatus(state=TaskState.TASK_STATE_COMPLETED),
),
UnsupportedOperationError,
),
(None, TaskNotFoundError),
],
)
async def test_active_task_start_setup_failure_closes_event_queues(
stored_task, expected_error
):
"""A failed start() closes both event queues.

Each EventQueueSource starts its dispatcher task when it is created, so
without this the dispatchers stay pending until garbage collection and
surface as ``Task was destroyed but it is pending!``.
"""
task_manager = Mock()
task_manager.get_task = AsyncMock(return_value=stored_task)

active_task = ActiveTask(
agent_executor=Mock(),
task_id='test-task-id',
task_manager=task_manager,
push_sender=Mock(),
)

with pytest.raises(expected_error):
await active_task.start(
call_context=ServerCallContext(), create_task_if_missing=False
)

assert active_task._event_queue_agent._dispatcher_task.done()
assert active_task._event_queue_subscribers._dispatcher_task.done()
Loading