Add cancel timeout when cancelling actions#5895
Merged
SteveMacenski merged 6 commits intoros-navigation:mainfrom Jan 26, 2026
Merged
Add cancel timeout when cancelling actions#5895SteveMacenski merged 6 commits intoros-navigation:mainfrom
SteveMacenski merged 6 commits intoros-navigation:mainfrom
Conversation
Signed-off-by: mini-1235 <[email protected]>
Signed-off-by: mini-1235 <[email protected]>
Signed-off-by: mini-1235 <[email protected]>
Signed-off-by: mini-1235 <[email protected]>
Codecov Report✅ All modified and coverable lines are covered by tests.
... and 25 files with indirect coverage changes 🚀 New features to boost your workflow:
|
Member
There was a problem hiding this comment.
Please rename to cancel_timeout instead, I think that's more clear. It is used in Halt, but it is for cancellations. Otherwise LGTM
Edit: Ditto with the docs PR. Also add to the migration guide and the reason 'why'. I think that breadcrumb trail could help the next person with this error easily.
Signed-off-by: mini-1235 <[email protected]>
Collaborator
Author
|
I am not sure why github sometimes close my PR when I push a commit :( |
mini-1235
changed the title
Signed-off-by: mini-1235 <[email protected]>
SteveMacenski
approved these changes
Jan 26, 2026
mergify Bot
pushed a commit
that referenced
this pull request
Jan 26, 2026
* Add halt timeout when cancelling actions Signed-off-by: mini-1235 <[email protected]> * Add to config Signed-off-by: mini-1235 <[email protected]> * Fix flaky test Signed-off-by: mini-1235 <[email protected]> * Retrigger Signed-off-by: mini-1235 <[email protected]> * Rename Signed-off-by: mini-1235 <[email protected]> * Lint Signed-off-by: mini-1235 <[email protected]> --------- Signed-off-by: mini-1235 <[email protected]> (cherry picked from commit 640196a) # Conflicts: # nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp # nav2_system_tests/src/system/nav2_system_params.yaml
8 tasks
mergify Bot
pushed a commit
that referenced
this pull request
Jan 26, 2026
* Add halt timeout when cancelling actions Signed-off-by: mini-1235 <[email protected]> * Add to config Signed-off-by: mini-1235 <[email protected]> * Fix flaky test Signed-off-by: mini-1235 <[email protected]> * Retrigger Signed-off-by: mini-1235 <[email protected]> * Rename Signed-off-by: mini-1235 <[email protected]> * Lint Signed-off-by: mini-1235 <[email protected]> --------- Signed-off-by: mini-1235 <[email protected]> (cherry picked from commit 640196a) # Conflicts: # nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp
8 tasks
Collaborator
Author
|
Do you want me to do the backports manually? |
Member
|
Yeah, the autobackports failed |
Collaborator
Author
|
will do tomorrow, I am heading to bed now :) |
This was referenced Jan 27, 2026
Prathmesh2931
pushed a commit
to Prathmesh2931/navigation2
that referenced
this pull request
Jan 27, 2026
* Add halt timeout when cancelling actions Signed-off-by: mini-1235 <[email protected]> * Add to config Signed-off-by: mini-1235 <[email protected]> * Fix flaky test Signed-off-by: mini-1235 <[email protected]> * Retrigger Signed-off-by: mini-1235 <[email protected]> * Rename Signed-off-by: mini-1235 <[email protected]> * Lint Signed-off-by: mini-1235 <[email protected]> --------- Signed-off-by: mini-1235 <[email protected]>
Pana1v
pushed a commit
to Arnav-panjla/navigation2
that referenced
this pull request
Feb 21, 2026
* Add halt timeout when cancelling actions Signed-off-by: mini-1235 <[email protected]> * Add to config Signed-off-by: mini-1235 <[email protected]> * Fix flaky test Signed-off-by: mini-1235 <[email protected]> * Retrigger Signed-off-by: mini-1235 <[email protected]> * Rename Signed-off-by: mini-1235 <[email protected]> * Lint Signed-off-by: mini-1235 <[email protected]> --------- Signed-off-by: mini-1235 <[email protected]>
kostica-ait
added a commit
to kostica-ait/navigation2
that referenced
this pull request
Mar 31, 2026
Instead of reusing server_timeout_ when waiting for action cancellation during halt(), use a separate cancel_timeout_ that can be set per node or via the blackboard. Defaults to default_cancel_timeout parameter in bt_navigator (default 50ms). Also adds the on_timeout virtual function to BtActionNode so derived nodes can react to goal acknowledgement timeouts. Backport of nav2 ros-navigation#5895. Signed-off-by: robogreen
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
2 participants
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.
Basic Info
Description of contribution in a few bullet points
Description of documentation updates required from your changes
Description of how this change was tested
Future work that may be required in bullet points
For Maintainers:
backport-*.