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

[16277] Fix communication with asymmetric ignoreParticipantFlags #3105

Merged
merged 5 commits into from
Nov 24, 2022
Merged

[16277] Fix communication with asymmetric ignoreParticipantFlags #3105

merged 5 commits into from
Nov 24, 2022

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Nov 21, 2022 •
edited by EduPonz
Loading

Description

Configuring a participant with ignoreParticipantFlags = FILTER_DIFFERENT_HOST | FILTER_DIFFERENT_PROCESS, and another one with the default configuration ignoreParticipantFlags = FILTER_NONE results in HEARTBEAT and ACKNACK messages sent to the multicast address and port for the builtin endpoints.

This PR fixes that situation by:

  1. Make participants that only want intraprocess communications to not announce locators
  2. Always ignore participants without locators when they are not on the same process.

As a bonus, participants that only want intraprocess communications set multicast TTL to 0 (so their announcements do not leave the host) and avoids creating the SHM transport.

@Mergifyio backport 2.7.x 2.6.x 2.1.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.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • 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.

Reviewer Checklist

  • 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 MiguelCompany marked this pull request as ready for review November 23, 2022 13:39
@MiguelCompany
Copy link
Member Author

@richiprosima Please test this

EduPonz
EduPonz approved these changes Nov 24, 2022
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.

LGTM

@EduPonz EduPonz merged commit 865702b into master Nov 24, 2022
@EduPonz EduPonz deleted the bugfix/16253 branch November 24, 2022 10:47
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 2.7.x 2.6.x 2.1.x

mergify bot pushed a commit that referenced this pull request Nov 24, 2022
@MiguelCompany @mergify
Fix communication with asymmetric ignoreParticipantFlags (#3105)
3a1c237 
* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@mergify mergify bot mentioned this pull request Nov 24, 2022
Merged
mergify bot pushed a commit that referenced this pull request Nov 24, 2022
@MiguelCompany @mergify
Fix communication with asymmetric ignoreParticipantFlags (#3105)
9e73f67 
* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@mergify mergify bot mentioned this pull request Nov 24, 2022
Closed
mergify bot pushed a commit that referenced this pull request Nov 24, 2022
@MiguelCompany @mergify
Fix communication with asymmetric ignoreParticipantFlags (#3105)
114e4c3 
* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@mergify mergify bot mentioned this pull request Nov 24, 2022
Closed
@mergify
Copy link
Contributor

mergify bot commented Nov 24, 2022

backport 2.7.x 2.6.x 2.1.x

✅ Backports have been created

@MiguelCompany MiguelCompany mentioned this pull request Nov 24, 2022
Merged
9 tasks
MiguelCompany added a commit that referenced this pull request Dec 2, 2022
@mergify @MiguelCompany
Fix communication with asymmetric ignoreParticipantFlags (#3111)
6de9842 
* Fix communication with asymmetric ignoreParticipantFlags (#3105)

* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

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

* Fix conflicts

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

* Added ignore_participant_flags() to Blackbox_FastRTPS PubSubReader. (#3114)

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

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

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
mergify bot added a commit that referenced this pull request Dec 2, 2022
@mergify
Fix communication with asymmetric ignoreParticipantFlags (#3111)
24fcb5f 
* Fix communication with asymmetric ignoreParticipantFlags (#3105)

* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

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

* Fix conflicts

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

* Added ignore_participant_flags() to Blackbox_FastRTPS PubSubReader. (#3114)

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

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

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 6de9842)
mergify bot added a commit that referenced this pull request Dec 2, 2022
@mergify
Fix communication with asymmetric ignoreParticipantFlags (#3111)
dab1f5c 
* Fix communication with asymmetric ignoreParticipantFlags (#3105)

* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

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

* Fix conflicts

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

* Added ignore_participant_flags() to Blackbox_FastRTPS PubSubReader. (#3114)

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

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

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 6de9842)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
MiguelCompany pushed a commit that referenced this pull request Dec 2, 2022
@mergify
Fix communication with asymmetric ignoreParticipantFlags (#3128)
5e4ed10 
* Fix communication with asymmetric ignoreParticipantFlags (#3105)

* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

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

* Fix conflicts

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

* Added ignore_participant_flags() to Blackbox_FastRTPS PubSubReader. (#3114)

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

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

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 6de9842)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
MiguelCompany added a commit that referenced this pull request Jan 26, 2023
@mergify @MiguelCompany @JLBuenoLopez
Fix communication with asymmetric ignoreParticipantFlags (backport #3111
f9a8c8a 
) (#3129)

* Fix communication with asymmetric ignoreParticipantFlags (#3111)

* Fix communication with asymmetric ignoreParticipantFlags (#3105)

* Refs #16253. Regression test.

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

* Refs #16253. Ignoring participants from other processes when they have no locators.

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

* Refs #16253. Avoid announcing locators for intraprocess-only participants.

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

* Refs #16253. Set TTL to 0 for intraprocess-only participants.

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

* Refs #16253. Avoid SHM transport for intraprocess-only participants.

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

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 865702b)

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

* Fix conflicts

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

* Added ignore_participant_flags() to Blackbox_FastRTPS PubSubReader. (#3114)

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

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

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 6de9842)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp

* Fixed conflicts

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

* Fixed build errors on blackbox test

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

* Remove blackbox regression test which uses a feature in the test transport not implemented in 2.1.x

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Miguel Company <[email protected]>
Co-authored-by: JLBuenoLopez-eProsima <[email protected]>
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @EduPonz