Fix issues with resuming async tasks awaiting a future (backport #1469)#1555
Closed
mergify[bot] wants to merge 1 commit intohumblefrom
Closed
Fix issues with resuming async tasks awaiting a future (backport #1469)#1555mergify[bot] wants to merge 1 commit intohumblefrom
mergify[bot] wants to merge 1 commit intohumblefrom
Conversation
Signed-off-by: Błażej Sowa <[email protected]> Signed-off-by: Nadav Elkabets <[email protected]> Co-authored-by: Nadav Elkabets <[email protected]> (cherry picked from commit 9695271) # Conflicts: # rclpy/rclpy/executors.py # rclpy/rclpy/task.py # rclpy/src/rclpy/events_executor/events_executor.cpp # rclpy/src/rclpy/events_executor/events_executor.hpp # rclpy/test/test_executor.py # rclpy/test/test_task.py
Contributor
Author
|
Cherry-pick of 9695271 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #1467
Fixes #1405
Fixes #1462
Is this user-facing behavior change?
The_pending()method in Future has been renamed topending()Did you use Generative AI?
Some of the comments and docstrings might be partially written by Github Copilot.
Additional Information
For #1467, I propagate a guard condition from a task to the awaited future and add this guard condition to the wait set in the executor. When a future is completed by an entity not controller by the executor (e.g. a separate thread), the guard condition is triggered and wakes up the executor so it can resume the task.For #1405, I just had to make sure the task is not yielded from_wait_for_ready_callbackswhen it is not ready to be resumed, hence theTask.ready()method.EDIT: Check this comment
This is an automatic backport of pull request #1469 done by [Mergify](https://mergify.com).