Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) #5495

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

Description

This PR addresses a TSAN potential deadlock by lock inversion report between StatefulWriter::matched_reader_remove() and (async)FlowController::run().

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • Any new/modified methods have been properly documented using Doxygen.

  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5432 done by [Mergify](https://mergify.com).

…ler` (#5432)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)
@MiguelCompany MiguelCompany added this to the v3.0.2 milestone Dec 13, 2024
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL December 16, 2024 15:48
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 16, 2024
@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Dec 17, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM

@Mario-DL Mario-DL merged commit 1814de0 into 3.0.x Dec 18, 2024
17 checks passed
@Mario-DL Mario-DL deleted the mergify/bp/3.0.x/pr-5432 branch December 18, 2024 08:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants