Skip to content

[16277] Fix communication with asymmetric ignoreParticipantFlags (backport #3105) #3111

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
Merged
merged 3 commits into from
Dec 2, 2022
Merged

[16277] Fix communication with asymmetric ignoreParticipantFlags (backport #3105) #3111

merged 3 commits into from
Dec 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2022

This is an automatic backport of pull request #3105 done by Mergify.
Cherry-pick of 865702b has failed:

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

You are currently cherry-picking commit 865702b44.
  (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/discovery/participant/PDPSimple.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@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 added the conflicts Backport PR wich git cherry pick failed label Nov 24, 2022
@mergify mergify bot mentioned this pull request Nov 24, 2022
Merged
9 tasks
@MiguelCompany
Fix conflicts
6022028 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Nov 24, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

This was referenced Nov 24, 2022
Closed
Closed
@MiguelCompany MiguelCompany added this to the v2.7.2 milestone Nov 29, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test windows

@MiguelCompany MiguelCompany merged commit 6de9842 into 2.7.x Dec 2, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.7.x/pr-3105 branch December 2, 2022 08:47
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.6.x 2.1.x

@mergify mergify bot mentioned this pull request Dec 2, 2022
Merged
mergify bot added a commit that referenced this pull request Dec 2, 2022
@mergify @MiguelCompany
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
@mergify mergify bot mentioned this pull request Dec 2, 2022
Merged
@mergify
Copy link
Contributor Author

mergify bot commented Dec 2, 2022

backport 2.6.x 2.1.x

✅ Backports have been created

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

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.7.2
Development

Successfully merging this pull request may close these issues.
1 participant
@MiguelCompany