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

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

Closed
wants to merge 1 commit into from

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.1.x/pr-3105
Your branch is up to date with 'origin/2.1.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:   test/blackbox/common/BlackboxTestsDiscovery.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.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

* 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 added the conflicts Backport PR wich git cherry pick failed label Nov 24, 2022
@MiguelCompany
Copy link
Member

We will backport from #3111 instead

@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-3105 branch November 24, 2022 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant