Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[20650] Create InitialConnection for TCP initial peers 2.13 & 2.10 & 2.6 (backport #4947) #5003

Merged
merged 2 commits into from
Jul 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2024

Description

This PR uses the features introduced in #4584 to ALWAYS create a connection channel for the TCP when initial peers are configured.

@Mergifyio backport 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A 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

  • N/A 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 #4947 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 27, 2024
Copy link
Contributor Author

mergify bot commented Jun 27, 2024

Cherry-pick of a0a4fee has failed:

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

You are currently cherry-picking commit a0a4feeff.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.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

* Refs #20650: Add test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20650: Create initial connect for initial peers

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit a0a4fee)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4947 branch from c477680 to 6bf2dd7 Compare June 27, 2024 10:26
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jun 27, 2024
@cferreiragonz cferreiragonz self-requested a review June 27, 2024 10:26
cferreiragonz
cferreiragonz previously approved these changes Jun 27, 2024
@cferreiragonz cferreiragonz added this to the v2.6.9 milestone Jul 1, 2024
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
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.

LGTM, failed tests unrelated

@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 Jul 3, 2024
@EduPonz EduPonz merged commit 1a278d4 into 2.6.x Jul 3, 2024
14 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4947 branch July 3, 2024 12:48
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants