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

[17283] Fix issues in Dynamic Network Interfaces (backport #5282) (backport #5304) #5390

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 7, 2024

Description

This PR adds a regression test based in Ubuntu containers for one long standing issue with dynamic network interfaces that was preventing communication when a participant was created with no network interfaces available.

It fixes the issue by correctly updating the locators on the proxy data of the participant, and all its readers or writers created with the default locators.

@Mergifyio backport 3.0.x 2.14.x 2.10.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.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5282 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #5304 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Nov 7, 2024

Cherry-pick of 66ec998 has failed:

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

You are currently cherry-picking commit 66ec998a8.
  (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:   include/fastdds/rtps/builtin/discovery/participant/PDP.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   test/dds/communication/CMakeLists.txt
	modified:   test/dds/communication/PubSubMain.cpp
	modified:   test/dds/communication/PublisherMain.cpp
	modified:   test/dds/communication/PublisherModule.cpp
	modified:   test/dds/communication/PublisherModule.hpp
	modified:   test/dds/communication/SubscriberModule.cpp
	new file:   test/dds/communication/dyn_network/CMakeLists.txt
	new file:   test/dds/communication/dyn_network/Dockerfile
	new file:   test/dds/communication/dyn_network/dynamic_interfaces.compose.yml
	new file:   test/dds/communication/dyn_network/launch_subscriber.bash

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   test/communication/PublisherMain.cpp
	both modified:   test/communication/SubscriberMain.cpp
	both modified:   test/dds/communication/SubscriberMain.cpp
	both modified:   test/dds/communication/SubscriberModule.hpp
	deleted by us:   test/dds/communication/security/PublisherModule.cpp
	deleted by us:   test/dds/communication/security/PublisherModule.hpp
	deleted by us:   test/dds/communication/security/SubscriberModule.cpp
	deleted by us:   test/dds/communication/security/SubscriberModule.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 Nov 7, 2024
@MiguelCompany MiguelCompany added this to the v2.10.6 milestone Nov 7, 2024
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Nov 8, 2024
@MiguelCompany MiguelCompany self-requested a review November 8, 2024 10:48
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 8, 2024
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany November 8, 2024 10:54
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany November 8, 2024 10:58
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany November 8, 2024 11:06
* Fix issues in Dynamic Network Interfaces (#5282)

* Refs #21690. Parse `--rescan` argument on communication applications.

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

* Refs #21690. Implement rescan mechanism.

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

* Refs #21690. Add docker infrastructure.

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

* Refs #21690. Add CMake infrastructure.

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

* Refs #21690. Ensure same domain and topic name are used.

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

* Refs #21690. Add `--loops` argument to publisher.

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

* Refs #21690. Publisher exits after publishing all samples.

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

* Refs #21690. Improve subscriber script.

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

* Refs #21690. Add test.

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

* Refs #21690. Make publisher wait subscriber.

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

* Refs #21690. Possible fix.

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

* Refs #21690. Clear locators before recalculating them.

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

* Refs #21690. Move local participant proxy update to PDP.

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

* Refs #21690. Improve new method's logic.

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

* Refs #21690. Include what you use.

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

* Refs #21690. Add empty method to update endpoint locators.

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

* Refs #21690. Add implementation for `update_endpoint_locators_if_default_nts`.

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

* Refs #21690. Compare against old default locators.

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

* Refs #21690. Update locators in attributes.

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

* Refs #17283. Avoid early return on `PDP::local_participant_attributes_update_nts`.

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

* Refs #17283. Apply suggestions.

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

---------

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

* Refs #17283: Fix conflicts

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

* Refs #17283: Keep original PR functionality

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

* Refs #17283: Please uncrustify

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

* Restore discovery server list check code.

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

* Make backported methods static methods instead of inline code.

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

* Methods get_default_xxx_locators with output argument.

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

* Only update attributes when necessary.

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

---------

Signed-off-by: eProsima <jesuspoderoso@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: eProsima <jesuspoderoso@eprosima.com>
(cherry picked from commit 66ec998)
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
#	test/communication/PublisherMain.cpp
#	test/communication/SubscriberMain.cpp
#	test/dds/communication/SubscriberMain.cpp
#	test/dds/communication/SubscriberModule.hpp
#	test/dds/communication/security/PublisherModule.cpp
#	test/dds/communication/security/PublisherModule.hpp
#	test/dds/communication/security/SubscriberModule.cpp
#	test/dds/communication/security/SubscriberModule.hpp
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany merged commit ad9b4eb into 2.10.x Nov 8, 2024
15 of 18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-5304 branch November 8, 2024 17:15
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