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 (backport #4849) #4865

Merged
merged 3 commits into from
Jun 28, 2024
Merged

[21055] Automatically unmatch remote participants on participant deletion (backport #4849) #4865

merged 3 commits into from
Jun 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2024

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.
This is an automatic backport of pull request #4849 done by [Mergify](https://mergify.com).

@MiguelCompany @mergify
Automatically unmatch remote participants on participant deletion (#4849
0d193e8 
)

* Refs #21055. Add regresion test.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #20995. Apply suggestion.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20995. Fix test build.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(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
Copy link
Contributor Author

mergify bot commented May 28, 2024

Cherry-pick of 689dd3f has failed:

On branch mergify/bp/2.6.x/pr-4849
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 689dd3f15.
  (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/rtps/builtin/BuiltinProtocols.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/builtin/discovery/participant/PDP.h
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsBasic.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 May 28, 2024
@mergify mergify bot mentioned this pull request May 28, 2024
Merged
12 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.9 milestone May 28, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Jun 6, 2024

@MiguelCompany would you mind addressing the conflicts here ? I think it is interesting to have this PR

@JesusPoderoso
Refs #21244: Fix conflicts
5f03d95 
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Jun 25, 2024
@JesusPoderoso JesusPoderoso requested a review from Mario-DL June 25, 2024 08:26
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 25, 2024
@Mario-DL
Copy link
Member

Friendly ping @JesusPoderoso

@JesusPoderoso
Refs #21055: Fix build issue
ca8f66a 
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso requested review from Mario-DL and removed request for Mario-DL June 26, 2024 16:21
@Mario-DL
Copy link
Member

@richiprosima please test discovery-server

Mario-DL
Mario-DL approved these changes Jun 27, 2024
View reviewed changes
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.

Failed tests unrelated, TSAN report is the same DDSDiscovery xtypes same one as always, I double checked in the logs

@Mario-DL Mario-DL 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 27, 2024
@EduPonz EduPonz merged commit 36fefdb into 2.6.x Jun 28, 2024
15 of 18 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4849 branch June 28, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mario-DL Mario-DL Mario-DL approved these changes

Assignees

@JesusPoderoso JesusPoderoso

Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.6.9
Development

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