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

[21055] Automatically unmatch remote participants on participant deletion #4849

Merged
merged 10 commits into from
May 28, 2024
Merged

[21055] Automatically unmatch remote participants on participant deletion #4849

merged 10 commits into from
May 28, 2024

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented May 27, 2024 •
edited by elianalf
Loading

Description

This is a manual backport of #4817 into 2.14.x

@Mergifyio backport 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.
  • 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.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany
Refs #21055. Add regresion test.
96cb03e 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Remove this-> on PDP.cpp
91b458a 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Change nullptr comparisons on PDP.cpp
75c99cc 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp
aa022d7 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Split PDP::remove_remote_participant in two methods.
06eec86 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Call new PDP::disable method when deleting `BuiltinPro…
d668705 
…tocols`.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. PDP::disable method automatically unmatches remote par…
c4cf272 
…ticipants.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #21055. Use std::lock_guard where possible.
90265e0 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v2.14.2 milestone May 27, 2024
@MiguelCompany
Refs #20995. Apply suggestion.
f8853b1 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@github-actions github-actions bot added the ci-pending PR which CI is running label May 27, 2024
@elianalf
Copy link
Contributor

@richiprosima please test this

@MiguelCompany
Refs #20995. Fix test build.
37de2d1 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany requested review from elianalf and removed request for elianalf May 27, 2024 13:40
@MiguelCompany
Copy link
Member Author

@richiprosima Please test this

@EduPonz EduPonz added the needs-review PR that is ready to be reviewed label May 28, 2024
@elianalf elianalf added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels May 28, 2024
@MiguelCompany
Copy link
Member Author

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

@mergify Mergify
Copy link
Contributor

mergify bot commented May 28, 2024 •
edited
Loading

backport 2.13.x 2.10.x 2.6.x

✅ Backports have been created

@MiguelCompany MiguelCompany merged commit 689dd3f into 2.14.x May 28, 2024
13 of 16 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/19764-2.14.x branch May 28, 2024 14:02
mergify bot pushed a commit that referenced this pull request May 28, 2024
@MiguelCompany @mergify
Automatically unmatch remote participants on participant deletion (#4849
1c47eba 
)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
mergify bot pushed a commit that referenced this pull request May 28, 2024
@MiguelCompany @mergify
Automatically unmatch remote participants on participant deletion (#4849
b7c7e2b 
)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)
This was referenced May 28, 2024
Merged
Merged
mergify bot pushed a commit that referenced this pull request May 28, 2024
@MiguelCompany @mergify
Automatically unmatch remote participants on participant deletion (#4849
0d193e8 
)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/participant/PDP.h
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
#	test/blackbox/common/DDSBlackboxTestsBasic.cpp
@mergify mergify bot mentioned this pull request May 28, 2024
Merged
12 tasks
MiguelCompany added a commit that referenced this pull request May 29, 2024
@mergify @MiguelCompany
Automatically unmatch remote participants on participant deletion (#4849
db27497 
) (#4864)

* Automatically unmatch remote participants on participant deletion (#4849)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp

* Fix conflicts

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request May 29, 2024
@mergify @MiguelCompany
Automatically unmatch remote participants on participant deletion (#4849
4a7c794 
) (#4863)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
EduPonz pushed a commit that referenced this pull request Jun 28, 2024
@mergify @MiguelCompany @JesusPoderoso
Automatically unmatch remote participants on participant deletion (#4849
36fefdb 
) (#4865)

* Automatically unmatch remote participants on participant deletion (#4849)

* Refs #21055. Add regresion test.

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

* Refs #21055. Remove `this->` on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on PDP.cpp

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

* Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp

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

* Refs #21055. Split `PDP::remove_remote_participant` in two methods.

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

* Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`.

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

* Refs #21055. `PDP::disable` method automatically unmatches remote participants.

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

* Refs #21055. Use `std::lock_guard` where possible.

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

* Refs #20995. Apply suggestion.

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

* Refs #20995. Fix test build.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 689dd3f)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/participant/PDP.h
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
#	test/blackbox/common/DDSBlackboxTestsBasic.cpp

* Refs #21244: Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21055: Fix build issue

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elianalf elianalf elianalf 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
v2.14.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@MiguelCompany @elianalf @EduPonz