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

[20816] Properly delete builtin statistics writers upon delete_contained_entities() (backport #4891) #4917

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2024

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) if delete_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

  • 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.

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

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

…ities()` (#4891)

* Refs #20816: Add BB test

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20816: Fix

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20816: Apply Edu's suggestion

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 0d62335)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
Copy link
Contributor Author

mergify bot commented Jun 8, 2024

Cherry-pick of 0d62335 has failed:

On branch mergify/bp/2.6.x/pr-4891
Your branch is up to date with 'origin/2.6.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:   test/blackbox/common/DDSBlackboxTestsStatistics.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
	both modified:   src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 8, 2024
@EduPonz EduPonz added this to the v2.6.9 milestone Jun 8, 2024
@Mario-DL Mario-DL removed the conflicts Backport PR wich git cherry pick failed label Jun 11, 2024
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from 852bc9a to c794a0d Compare June 11, 2024 06:11
@Mario-DL Mario-DL self-requested a review June 11, 2024 06:12
@Mario-DL Mario-DL added the ci-pending PR which CI is running label Jun 11, 2024
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from c794a0d to 60e3d8b Compare June 11, 2024 06:26
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 11, 2024 06:26
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from 60e3d8b to 9438662 Compare June 11, 2024 07:14
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 11, 2024 07:17
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from 9438662 to b1ba952 Compare June 11, 2024 07:43
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 11, 2024 07:43
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from b1ba952 to 0a3ff96 Compare June 11, 2024 08:51
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 11, 2024 08:52
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4891 branch from 0a3ff96 to 5022e56 Compare June 17, 2024 08:10
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 17, 2024 08:10
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, failed tests are unrelated to the changes

@EduPonz EduPonz merged commit 15a93a0 into 2.6.x Jun 17, 2024
8 of 12 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4891 branch June 17, 2024 10:34
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