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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Jun 8, 2024
Merged

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

merged 3 commits into from
Jun 8, 2024

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Jun 3, 2024 •
edited by EduPonz
Loading

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.

@Mario-DL Mario-DL added this to the v3.0.0 milestone Jun 3, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 3, 2024
@Mario-DL
Refs #20816: Add BB test
dc3cc50 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Refs #20816: Fix
22dfe3c 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested review from EduPonz and removed request for richiprosima June 3, 2024 20:08
EduPonz
EduPonz suggested changes Jun 5, 2024
View reviewed changes
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

Only one little NIT. 👏🏼

test/blackbox/common/DDSBlackboxTestsStatistics.cpp Outdated Show resolved Hide resolved
@Mario-DL
Refs #20816: Apply Edu's suggestion
f50beaf 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested a review from EduPonz June 6, 2024 05:35
@EduPonz EduPonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 8, 2024
@EduPonz
Copy link

EduPonz commented Jun 8, 2024

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

@EduPonz EduPonz merged commit 0d62335 into master Jun 8, 2024
10 of 11 checks passed
@EduPonz EduPonz deleted the bugfix/20816 branch June 8, 2024 05:42
@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 8, 2024 •
edited
Loading

backport 2.14.x 2.13.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 8, 2024
@Mario-DL @mergify
Properly delete builtin statistics writers upon `delete_contained_ent…
6013102 
…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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@mergify mergify bot mentioned this pull request Jun 8, 2024
Merged
15 tasks
mergify bot pushed a commit that referenced this pull request Jun 8, 2024
@Mario-DL @mergify
Properly delete builtin statistics writers upon `delete_contained_ent…
0283c4e 
…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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@mergify mergify bot mentioned this pull request Jun 8, 2024
Merged
15 tasks
mergify bot pushed a commit that referenced this pull request Jun 8, 2024
@Mario-DL @mergify
Properly delete builtin statistics writers upon `delete_contained_ent…
5f18186 
…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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@mergify mergify bot mentioned this pull request Jun 8, 2024
Merged
15 tasks
mergify bot pushed a commit that referenced this pull request Jun 8, 2024
@Mario-DL @mergify
Properly delete builtin statistics writers upon `delete_contained_ent…
548a445 
…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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
@mergify mergify bot mentioned this pull request Jun 8, 2024
Merged
15 tasks
EduPonz pushed a commit that referenced this pull request Jun 8, 2024
@Mario-DL @EduPonz
Properly delete builtin statistics writers upon `delete_contained_ent…
911278e 
…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 pushed a commit that referenced this pull request Jun 8, 2024
@mergify @Mario-DL
Properly delete builtin statistics writers upon `delete_contained_ent…
7344e31 
…ities()` (#4891) (#4914)

* Refs #20816: Add BB test



* Refs #20816: Fix



* Refs #20816: Apply Edu's suggestion



---------


(cherry picked from commit 0d62335)

Signed-off-by: eduponz <eduardoponz@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Jun 17, 2024
@mergify @Mario-DL
Properly delete builtin statistics writers upon `delete_contained_ent…
15a93a0 
…ities()` (#4891) (#4917)

* Properly delete builtin statistics writers upon `delete_contained_entities()`  (#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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp

* Solve conflicts

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
JesusPoderoso pushed a commit that referenced this pull request Jul 10, 2024
@Mario-DL @JesusPoderoso
Properly delete builtin statistics writers upon `delete_contained_ent…
a5aa54c 
…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)
EduPonz pushed a commit that referenced this pull request Jul 11, 2024
@mergify @Mario-DL
Properly delete builtin statistics writers upon `delete_contained_ent…
7abaad5 
…ities()` (#4891) (#4915)

* 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)

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
MiguelCompany pushed a commit that referenced this pull request Sep 12, 2024
@Mario-DL @MiguelCompany
Properly delete builtin statistics writers upon `delete_contained_ent…
3ce98b8 
…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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
MiguelCompany added a commit that referenced this pull request Sep 18, 2024
@mergify @Mario-DL @MiguelCompany
Properly delete builtin statistics writers upon `delete_contained_ent…
6f85f6a 
…ities()` (#4891) (#4916)

* Properly delete builtin statistics writers upon `delete_contained_entities()`  (#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)

# Conflicts:
#	src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp

* Fix conflicts.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EduPonz EduPonz EduPonz approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Mario-DL @EduPonz