[Backport] Fix action server deadlock (#1285) (#1313) #1518
Merged
jacobperron merged 3 commits intoros2:foxyfrom Jan 20, 2021
Merged
[Backport] Fix action server deadlock (#1285) (#1313) #1518jacobperron merged 3 commits intoros2:foxyfrom
jacobperron merged 3 commits intoros2:foxyfrom
Conversation
This patch actually does 4 related things: 1. Renames the recursive mutex in the ServerBaseImpl class to action_server_reentrant_mutex_, which makes it a lot clearer what it is meant to lock. 2. Adds some additional error checking where checks were missed. 3. Adds a lock to publish_status so that the action_server structure is protected. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
jacobperron
reviewed
Jan 19, 2021
Member
jacobperron
left a comment
There was a problem hiding this comment.
LGTM, pending CI. One nitpick that I'd like to see the change to the comment in rclcpp reverted.
Signed-off-by: Daisuke Sato <daisukes@cmu.edu>
jacobperron
approved these changes
Jan 20, 2021
|
This pull request has been mentioned on ROS Discourse. There might be relevant details there: |
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
5 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.
This is a backport of #1313
I didn't include 8c8c268 and 543a3c3, but 579e9d0 and modified ca3ad7d.