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

[21170] Fix DS servers not connecting due to ports logic (backport #4941) #4951

Merged
merged 1 commit into from
Jun 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2024

Description

This PR fixes a bug that was avoiding discovery when a DS server tries to connect to another server which has a smaller physical port. The logic implemented in #4586 needs to be used to fix the issue.
It also adds support to automatically set the logical port of remote servers when the participant discoveryProtocol is configured as DiscoveryProtocol::SERVER, which was missing.

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.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; 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 #4941 done by [Mergify](https://mergify.com).

* Refs #21170: Add DS servers connection test

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

* Refs #21170: Support DS servers connection

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

* Refs #21170: Revision

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

* Refs #21170: Uncrustify

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

* Refs #21170: Fix Windows build & comment

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit b441560)
@MiguelCompany MiguelCompany added this to the v2.10.5 milestone Jun 14, 2024
@MiguelCompany MiguelCompany self-requested a review June 19, 2024 05:55
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 19, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test discovery-server

@MiguelCompany MiguelCompany merged commit 660e1d3 into 2.10.x Jun 19, 2024
16 of 19 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4941 branch June 19, 2024 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants