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) #4914

Merged
merged 1 commit into from
Jun 8, 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).

Copy link
Contributor Author

mergify bot commented Jun 8, 2024

Cherry-pick of 0d62335 has failed:

On branch mergify/bp/2.14.x/pr-4891
Your branch is up to date with 'origin/2.14.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 8, 2024
@EduPonz EduPonz added this to the v2.14.2 milestone Jun 8, 2024
…ities()` (#4891)

* Refs #20816: Add BB test

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

* Refs #20816: Fix

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

* Refs #20816: Apply Edu's suggestion

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 0d62335)

Signed-off-by: eduponz <eduardoponz@eprosima.com>
@EduPonz EduPonz force-pushed the mergify/bp/2.14.x/pr-4891 branch from 6013102 to 911278e Compare June 8, 2024 06:01
@EduPonz EduPonz self-requested a review June 8, 2024 06:02
@EduPonz EduPonz removed the conflicts Backport PR wich git cherry pick failed label Jun 8, 2024
@EduPonz EduPonz self-requested a review June 8, 2024 06:02
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 8, 2024
@EduPonz
Copy link

EduPonz commented Jun 8, 2024

@richiprosima please test discovery-server

@EduPonz EduPonz merged commit 7344e31 into 2.14.x Jun 8, 2024
16 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.14.x/pr-4891 branch June 8, 2024 12:01
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