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

Fix deadlock with security and timers. [11923] #2034

Merged
merged 3 commits into from
Jul 5, 2021

Conversation

richiware
Copy link
Member

This PR fixes a deadlock between the SecurityManager's mutex and the DiscoveredParticipantInfo's event. The destruction of the DiscoveryParticipantInfo have to happen without the SecurityManager's mutex locked.

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
@richiware richiware changed the title Fix deadlock with security and timers. Fix deadlock with security and timers. [11923] Jul 2, 2021
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor nits

src/cpp/rtps/security/SecurityManager.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/security/SecurityManager.cpp Show resolved Hide resolved
src/cpp/rtps/security/SecurityManager.cpp Show resolved Hide resolved
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Jul 2, 2021
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@richiware
Copy link
Member Author

Tests were passed in #2047.

@richiware richiware merged commit c0783e7 into master Jul 5, 2021
@richiware richiware deleted the bugfix/deadlock-security-timer branch July 5, 2021 05:34
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