Skip to content

[23767] Fix data races on DataWriterImpl qos access (backport #6409)#6424

Open
mergify[bot] wants to merge 1 commit into
2.14.xfrom
mergify/bp/2.14.x/pr-6409
Open

[23767] Fix data races on DataWriterImpl qos access (backport #6409)#6424
mergify[bot] wants to merge 1 commit into
2.14.xfrom
mergify/bp/2.14.x/pr-6409

Conversation

@mergify

@mergify mergify Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Description

This PR attempts to fix data races on DataWriterImpl::qos_, where mainly the enable() and set_qos functions accessed the element simultaneously.

Added a new qos_mutex_ that guards qos_ and writer_. A concurrency regression test has also been included.

@Mergifyio backport 3.2.x 2.14.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.

  • N/A: 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.
  • N/A: 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 #6409 done by [Mergify](https://mergify.com).

@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Jun 9, 2026
@mergify

mergify Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 9a31251 has failed:

On branch mergify/bp/2.14.x/pr-6409
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit 9a3125144.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/publisher/DataWriterImpl.hpp
	modified:   test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/publisher/DataWriter.cpp
	both modified:   src/cpp/fastdds/publisher/DataWriterImpl.cpp
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@MiguelCompany MiguelCompany added this to the v2.14.7 milestone Jun 9, 2026
@MiguelCompany

Copy link
Copy Markdown
Member

@ZakariaTalbi Would you mind fixing the conflicts here?

@ZakariaTalbi
ZakariaTalbi force-pushed the mergify/bp/2.14.x/pr-6409 branch from 916ad68 to f734514 Compare June 10, 2026 09:46
Signed-off-by: Zakaria Talbi Lalmi <zakariatalbi@eprosima.com>
@ZakariaTalbi
ZakariaTalbi force-pushed the mergify/bp/2.14.x/pr-6409 branch from f734514 to d2eb0c4 Compare June 10, 2026 13:48
@ZakariaTalbi ZakariaTalbi added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jun 10, 2026
@ZakariaTalbi
ZakariaTalbi requested review from richiprosima and removed request for richiprosima June 10, 2026 13:54
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.

2 participants