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 #4947

Merged
merged 2 commits into from
Jun 27, 2024

Conversation

cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz commented Jun 14, 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.

@cferreiragonz cferreiragonz added the needs-review PR that is ready to be reviewed label Jun 14, 2024
@cferreiragonz cferreiragonz added this to the v2.13.6 milestone Jun 14, 2024
@cferreiragonz cferreiragonz changed the base branch from master to 2.13.x June 14, 2024 07:14
@cferreiragonz cferreiragonz force-pushed the bugfix/initial_peers_tcp_2.13 branch from 1ad97de to ee8360a Compare June 14, 2024 07:16
@cferreiragonz
Copy link
Contributor Author

@Mergifyio backport 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Jun 14, 2024

backport 2.10.x 2.6.x

✅ Backports have been created

@JesusPoderoso JesusPoderoso self-requested a review June 18, 2024 06:17
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 18, 2024
JesusPoderoso
JesusPoderoso previously approved these changes Jun 18, 2024
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

@JesusPoderoso JesusPoderoso removed the needs-review PR that is ready to be reviewed label Jun 18, 2024
@cferreiragonz cferreiragonz force-pushed the bugfix/initial_peers_tcp_2.13 branch from ee8360a to 356eb4c Compare June 18, 2024 15:01
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz force-pushed the bugfix/initial_peers_tcp_2.13 branch from 356eb4c to 7177aa1 Compare June 18, 2024 15:02
@JesusPoderoso JesusPoderoso self-requested a review June 25, 2024 08:31
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

@JesusPoderoso JesusPoderoso 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 Jun 26, 2024
@EduPonz EduPonz merged commit a0a4fee into 2.13.x Jun 27, 2024
16 of 18 checks passed
@EduPonz EduPonz deleted the bugfix/initial_peers_tcp_2.13 branch June 27, 2024 08:01
mergify bot pushed a commit that referenced this pull request Jun 27, 2024
* 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)
mergify bot pushed a commit that referenced this pull request Jun 27, 2024
* 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 added a commit that referenced this pull request Jun 27, 2024
* 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
EduPonz pushed a commit that referenced this pull request Jul 3, 2024
…) (#5003)

* Create InitialConnection for TCP initial peers 2.13 & 2.10 & 2.6 (#4947)

* 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

* Remove TCP lock_guard in disconnection

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jul 31, 2024
* 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)
MiguelCompany pushed a commit that referenced this pull request Aug 28, 2024
* 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)
MiguelCompany pushed a commit that referenced this pull request Sep 20, 2024
* 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)
MiguelCompany pushed a commit that referenced this pull request Oct 28, 2024
* 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)
cferreiragonz added a commit that referenced this pull request Nov 8, 2024
* 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)
MiguelCompany pushed a commit that referenced this pull request Nov 9, 2024
* 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)
# 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