Skip to content

Tsan/2.6.x/flowcontroler loi deadlock#6463

Merged
MiguelCompany merged 5 commits into
2.6.xfrom
tsan/2.6.x/flowcontroler-loi-deadlock
Jul 7, 2026
Merged

Tsan/2.6.x/flowcontroler loi deadlock#6463
MiguelCompany merged 5 commits into
2.6.xfrom
tsan/2.6.x/flowcontroler-loi-deadlock

Conversation

@ZakariaTalbi

@ZakariaTalbi ZakariaTalbi commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Description

This PR aims to fix a potential lock-order-inversion deadlock in StatefulWriter between the LocatorSelectorSender and the FlowControler that triggered during participant tear-down while another participant still delivers samples.

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
  • [N/A] Any new/modified methods have been properly documented using Doxygen.
  • [N/A] Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • [N/A] Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • [N/A] 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.
  • [N/A] 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.

Signed-off-by: Zakaria Talbi Lalmi <zakariatalbi@eprosima.com>
Signed-off-by: Zakaria Talbi Lalmi <zakariatalbi@eprosima.com>
@ZakariaTalbi
ZakariaTalbi requested a review from richiprosima July 2, 2026 13:14
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jul 2, 2026
@MiguelCompany MiguelCompany added this to the v2.6.12 milestone Jul 3, 2026

@cferreiragonz cferreiragonz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Test is not 100% deterministic but it fails frequently. I will also add a new commit fixing a build issue from another CVE backport

Comment thread src/cpp/rtps/writer/StatefulWriter.cpp Outdated
cferreiragonz and others added 2 commits July 6, 2026 14:34
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Signed-off-by: Zakaria Talbi Lalmi <zakariatalbi@eprosima.com>
@ZakariaTalbi
ZakariaTalbi requested review from richiprosima and removed request for richiprosima July 6, 2026 13:23
cferreiragonz
cferreiragonz previously approved these changes Jul 6, 2026

@cferreiragonz cferreiragonz left a comment

Copy link
Copy Markdown
Contributor

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 requested review from richiprosima and removed request for richiprosima July 6, 2026 15:01
Signed-off-by: Zakaria Talbi Lalmi <zakariatalbi@eprosima.com>
@MiguelCompany
MiguelCompany merged commit bfe6ce9 into 2.6.x Jul 7, 2026
17 of 18 checks passed
@MiguelCompany
MiguelCompany deleted the tsan/2.6.x/flowcontroler-loi-deadlock branch July 7, 2026 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants