Closed mergify[bot] closed 2 weeks ago
Cherry-pick of 0d62335cc86dbe8cb43d347acf9bde547de179d4 has failed:
On branch mergify/bp/2.10.x/pr-4891
Your branch is up to date with 'origin/2.10.x'.
You are currently cherry-picking commit 0d62335cc.
(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/statistics/fastdds/domain/DomainParticipantImpl.hpp
modified: test/blackbox/common/DDSBlackboxTestsStatistics.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/statistics/fastdds/domain/DomainParticipantImpl.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
Description
This PR fixes a wrong behavior that occurs when closing an application making an intensive use of statistics. If in the shutdown pipeline, after a manual removal of entities (
delete_datareader
,delete_subscriber
,delete_topic
) ifdelete_contained_entities()
was called, it caused a race when alive endpoints try to keep using the statistics builtin endpoints (writers).@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x
Contributor Checklist
[X] Commit messages follow the project guidelines.
[X] The code follows the style guidelines of this project.
[X] 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
[X] Any new/modified methods have been properly documented using Doxygen.
[x] Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
[X] Changes are backport compatible: they do NOT break ABI nor change library core behavior.
[X] Changes are API compatible.
[X] New feature has been added to the
versions.md
file (if applicable).[X] New feature has been documented/Current behavior is correctly described in the documentation.
[X] Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4891 done by Mergify.