Fix deadlock between PDP and StatefulReader #871
Merged
Conversation
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
This releases the PDP mutex before calling a function that may try to acquire the mutex on a StatefulReader. Signed-off-by: Shane Loretz<sloretz@openrobotics.org> Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
Contributor
Author
|
@richiprosima would it be possible to get this reviewed and merged into the 1.9.x branch this week? |
Member
|
Build status:
|
richiware
requested changes
Nov 20, 2019
Member
richiware
left a comment
richiware
left a comment
There was a problem hiding this comment.
I agree with the PR. Only one suggestion.
Member
|
After running the CI I will merge the PR and tomorrow I will make the backport to 1.9.x |
Member
|
Build status:
|
richiware
approved these changes
Nov 21, 2019
Member
|
Failed test not related. |
richiware
pushed a commit
that referenced
this pull request
Nov 21, 2019
* Fix deadlock between PDP and StatefulReader This releases the PDP mutex before calling a function that may try to acquire the mutex on a StatefulReader. Signed-off-by: Shane Loretz<sloretz@openrobotics.org> Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Removing unnecessary lock().
richiware
added a commit
that referenced
this pull request
Nov 21, 2019
Fix deadlock between PDP and StatefulReader (backport of #871)
sloretz
added a commit
to sloretz/Fast-RTPS
that referenced
this pull request
Feb 19, 2020
* Fix deadlock between PDP and StatefulReader This releases the PDP mutex before calling a function that may try to acquire the mutex on a StatefulReader. Signed-off-by: Shane Loretz<sloretz@openrobotics.org> Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Removing unnecessary lock(). Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 intended to fix a deadlock that causes tests to hang on the ROS 2 buildfarm (ros2/build_farmer#248) using Fast-RTPS
v1.9.2. There's more info here: ros2/build_farmer#248 (comment).This PR avoids deadlock by releasing the PDP mutex before calling
remove_remote_participant(). It seems like a reasonable thing to do sinceremove_remote_participant()acquires the lock internally, though I don't know if releasing the lock momentarily breaks any assumptions incheck_remote_participant_lifeliness().