Skip to content

Conversation

@yarolegovich
Copy link
Member

Description

We check that a Task is in a cancellable state before calling agent_executor.cancel.

This doesn't guarantee there's no task completion event in the queue which will be applied before our task cancellation request gets handled.

This PR adds an extra check to ensure that we don't return a Task in a non-cancelled state as a successful cancellation call response. Instead we raise TaskNotCancelableError.

@yarolegovich yarolegovich requested a review from a team as a code owner September 1, 2025 09:02
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @yarolegovich, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a potential race condition in task cancellation logic. It ensures that the system accurately reports task cancellation status, preventing scenarios where a task might appear canceled but has actually completed concurrently. The changes enhance the reliability of task management by explicitly validating the final state of a task after a cancellation request.

Highlights

  • Robust Task Cancellation: Implemented an additional check in on_cancel_task to verify that a task is indeed in a canceled state after a cancellation attempt.
  • Error Handling: Introduced TaskNotCancelableError to be raised when a task cannot be successfully canceled due to concurrent completion, preventing false positives.
  • Test Coverage: Added a new test case (test_on_cancel_task_completes_during_cancellation) to specifically cover the scenario where a task completes concurrently during a cancellation attempt.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly addresses a race condition where a task could complete while a cancellation request is in flight. The fix in on_cancel_task is robust, ensuring that the task's final state is checked after attempting cancellation. The addition of a new test case to cover this scenario is also great. I have one suggestion to make the new test even more comprehensive by parameterizing it to cover all relevant terminal states.

@holtskinner holtskinner merged commit f4c9c18 into a2aproject:main Sep 2, 2025
5 checks passed
holtskinner pushed a commit that referenced this pull request Sep 2, 2025
🤖 I have created a release *beep* *boop*
---


##
[0.3.4](v0.3.3...v0.3.4)
(2025-09-02)


### Features

* Add `ServerCallContext` into task store operations
([#443](#443))
([e3e5c4b](e3e5c4b))
* Add extensions support to `TaskUpdater.add_artifact`
([#436](#436))
([598d8a1](598d8a1))


### Bug Fixes

* convert auth_required state in proto utils
([#444](#444))
([ac12f05](ac12f05))
* handle concurrent task completion during cancellation
([#449](#449))
([f4c9c18](f4c9c18))
* Remove logger error from init on `rest_adapter` and `jsonrpc_app`
([#439](#439))
([9193208](9193208))
* resolve streaming endpoint deadlock by pre-consuming request body
([#426](#426))
([4186731](4186731))
* Sync jsonrpc and rest implementation of authenticated agent card
([#441](#441))
([9da9ecc](9da9ecc))


### Performance Improvements

* Improve performance and code style for `proto_utils.py`
([#452](#452))
([1e4b574](1e4b574))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants