Skip to content
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.

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

[JTC]: Abort goal on deactivate (backport #1517) #1521

Merged
merged 1 commit into from
Feb 4, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2025

Currently, when deactivating the JTC once a trajectory is being executed leads to the following problems:

I narrowed that down to the RealtimeServerGoalHandle calling gh_->canceled which is supposed to be called only, once the goal is already cancelling according to its documentation. The transition doesn't succeed and hence that message gets repeated in every cycle of the non-realtime-thread, and the action never terminates.

I've added a test for that event in this PR and a possible solution: Calling setAborted instead of setCanceled in the JTC when it is being deactivated does work. I also think, this is a valid feedback to the user, as the goal isn't preempted by the user but it is aborted due to the controller going down.


This is an automatic backport of pull request #1517 done by Mergify.

Copy link

codecov bot commented Feb 4, 2025

Codecov Report

Attention: Patch coverage is 66.66667% with 17 lines in your changes missing coverage. Please review.

Project coverage is 66.85%. Comparing base (f5c4c3c) to head (876aa4d).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
...ectory_controller/test/test_trajectory_actions.cpp 66.00% 3 Missing and 14 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1521      +/-   ##
==========================================
+ Coverage   66.76%   66.85%   +0.08%     
==========================================
  Files         114      114              
  Lines       13409    13459      +50     
  Branches     8288     8334      +46     
==========================================
+ Hits         8953     8998      +45     
- Misses       1435     1436       +1     
- Partials     3021     3025       +4     
Flag Coverage Δ
unittests 66.85% <66.66%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ory_controller/src/joint_trajectory_controller.cpp 82.03% <100.00%> (+0.99%) ⬆️
...ectory_controller/test/test_trajectory_actions.cpp 84.38% <66.00%> (-1.49%) ⬇️

... and 3 files with indirect coverage changes

@christophfroehlich christophfroehlich merged commit ff714c7 into humble Feb 4, 2025
13 of 14 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1517 branch February 4, 2025 10:30
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