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

Waitset deadlock fix (backport #2744) #2771

Merged
merged 1 commit into from
Jun 22, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2022

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs 14681. Fixing issue 4169.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing compiler errors & warnings.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing testing Mocks.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Addressing reviewer comments.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Debugging fixes.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Linter pass

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Adding a ProxyPool class to avoid EDP ABBAs on temporary proxy mutex.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Prevent reentrancy issues on shared_mutexes using tls

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Mock updates to match new RTPSParticipantImpl behavior.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Linter pass..

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing gcc/clang warnings

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing clang warnings

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Unifying all temporary proxies in PDP owned pools

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Linter pass

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. RTPSStatisticsTests.statistics_rpts_listener_gap_callback fixed

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. RTPSWriterTests CMakelists.txt fix for windows.

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing clang -Wunused-lambda-capture issue

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Fixing proxies copy to fix PubSubBasic.ReceivedPartitionDataExceedsSizeLimit blackbox

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Refs 14681. Addressing reviewer's comments

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

* Refs #14813: WaitSet deadlock fix

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #14813: Added missing protection

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Co-authored-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit 7b05712)
@mergify mergify bot mentioned this pull request Jun 22, 2022
13 tasks
@MiguelCompany MiguelCompany added this to the v2.6.2 milestone Jun 22, 2022
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.

LGTM with green CI

@MiguelCompany MiguelCompany changed the title [14813] WaitSet deadlock fix <master> (backport #2744) Fixed several lock order inversion issues (backport #2717 and #2744) Jun 22, 2022
@MiguelCompany MiguelCompany changed the title Fixed several lock order inversion issues (backport #2717 and #2744) Waitset deadlock fix (backport #2744) Jun 22, 2022
@MiguelCompany MiguelCompany merged commit 2edded2 into 2.6.x Jun 22, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-2744 branch June 22, 2022 09:58
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