[21170] Fix DS servers not connecting due to ports logic #4941

cferreiragonz · 2024-06-12T10:39:04Z

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.

cferreiragonz · 2024-06-12T12:38:55Z

@richiprosima please test_3 discovery-server

Mario-DL

LGTM with green Tsan CI. I think we can set it as ready to review

test/blackbox/common/DDSBlackboxTestsDiscovery.cpp

MiguelCompany

LGTM with uncrustify fixed and green CI

MiguelCompany · 2024-06-13T08:32:57Z

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

mergify · 2024-06-13T08:33:05Z

backport 2.14.x 2.13.x 2.10.x 2.6.x

✅ Backports have been created

#4949 [21170] Fix DS servers not connecting due to ports logic (backport #4941) has been created for branch 2.14.x
#4950 [21170] Fix DS servers not connecting due to ports logic (backport #4941) has been created for branch 2.13.x
#4951 [21170] Fix DS servers not connecting due to ports logic (backport #4941) has been created for branch 2.10.x
#4952 [21170] Fix DS servers not connecting due to ports logic (backport #4941) has been created for branch 2.6.x

MiguelCompany · 2024-06-13T09:57:02Z

@cferreiragonz There's a warning in windows. Could you take a look?

MiguelCompany · 2024-06-13T10:13:22Z

@richiprosima Please test_3 discovery-server

cferreiragonz · 2024-06-13T12:36:43Z

@richiprosima Please test_3 discovery-server

MiguelCompany

LGTM with uncrustify and CI green

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

cferreiragonz · 2024-06-14T06:35:21Z

@richiprosima Please test_3 discovery-server

* 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)

* 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) Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>

cferreiragonz added this to the v3.0.0 milestone Jun 12, 2024

cferreiragonz requested a review from Mario-DL June 12, 2024 12:38

github-actions bot added ci-pending PR which CI is running labels Jun 12, 2024

cferreiragonz changed the title ~~[21170] Fix DS servers not connecting due to log_port logic~~ [21170] Fix DS servers not connecting due to ports logic Jun 12, 2024

Mario-DL previously approved these changes Jun 13, 2024

View reviewed changes

MiguelCompany marked this pull request as ready for review June 13, 2024 05:48

MiguelCompany requested changes Jun 13, 2024

View reviewed changes

test/blackbox/common/DDSBlackboxTestsDiscovery.cpp Outdated Show resolved Hide resolved

test/blackbox/common/DDSBlackboxTestsDiscovery.cpp Outdated Show resolved Hide resolved

cferreiragonz dismissed Mario-DL’s stale review via 73056ea June 13, 2024 07:24

cferreiragonz force-pushed the bugfix/ds_server_connection branch from f231133 to 73056ea Compare June 13, 2024 07:24

MiguelCompany previously approved these changes Jun 13, 2024

View reviewed changes

cferreiragonz dismissed MiguelCompany’s stale review via 2f3babb June 13, 2024 08:28

MiguelCompany self-requested a review June 13, 2024 08:31

MiguelCompany previously approved these changes Jun 13, 2024

View reviewed changes

cferreiragonz dismissed MiguelCompany’s stale review via a12e8e7 June 13, 2024 10:08

MiguelCompany self-requested a review June 13, 2024 10:08

MiguelCompany previously approved these changes Jun 13, 2024

View reviewed changes

cferreiragonz dismissed MiguelCompany’s stale review via 4744a3b June 13, 2024 14:51

MiguelCompany previously approved these changes Jun 14, 2024

View reviewed changes

cferreiragonz added 5 commits June 14, 2024 08:31

Refs #21170: Add DS servers connection test

5e61ade

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

Refs #21170: Support DS servers connection

ee6fa64

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

Refs #21170: Revision

a7f5989

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

Refs #21170: Uncrustify

ff1e475

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

Refs #21170: Fix Windows build & comment

1d732cc

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

cferreiragonz dismissed MiguelCompany’s stale review via 1d732cc June 14, 2024 06:32

cferreiragonz force-pushed the bugfix/ds_server_connection branch from 4744a3b to 1d732cc Compare June 14, 2024 06:32

cferreiragonz requested a review from MiguelCompany June 14, 2024 06:33

MiguelCompany approved these changes Jun 14, 2024

View reviewed changes

MiguelCompany merged commit b441560 into master Jun 14, 2024
11 of 12 checks passed

MiguelCompany deleted the bugfix/ds_server_connection branch June 14, 2024 12:03

mergify bot mentioned this pull request Jun 14, 2024

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

Merged

11 tasks

mergify bot mentioned this pull request Jun 14, 2024

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

Merged

11 tasks

mergify bot mentioned this pull request Jun 14, 2024

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

Merged

11 tasks

mergify bot mentioned this pull request Jun 14, 2024

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

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[21170] Fix DS servers not connecting due to ports logic #4941

[21170] Fix DS servers not connecting due to ports logic #4941

cferreiragonz commented Jun 12, 2024 •

edited by MiguelCompany

Loading

cferreiragonz commented Jun 12, 2024

Mario-DL left a comment

MiguelCompany left a comment

MiguelCompany commented Jun 13, 2024

mergify bot commented Jun 13, 2024 •

edited

Loading

MiguelCompany commented Jun 13, 2024

MiguelCompany commented Jun 13, 2024

cferreiragonz commented Jun 13, 2024

MiguelCompany left a comment

cferreiragonz commented Jun 14, 2024

[21170] Fix DS servers not connecting due to ports logic #4941

[21170] Fix DS servers not connecting due to ports logic #4941

Conversation

cferreiragonz commented Jun 12, 2024 • edited by MiguelCompany Loading

Description

Contributor Checklist

Reviewer Checklist

cferreiragonz commented Jun 12, 2024

Mario-DL left a comment

Choose a reason for hiding this comment

MiguelCompany left a comment

Choose a reason for hiding this comment

MiguelCompany commented Jun 13, 2024

mergify bot commented Jun 13, 2024 • edited Loading

✅ Backports have been created

MiguelCompany commented Jun 13, 2024

MiguelCompany commented Jun 13, 2024

cferreiragonz commented Jun 13, 2024

MiguelCompany left a comment

Choose a reason for hiding this comment

cferreiragonz commented Jun 14, 2024

cferreiragonz commented Jun 12, 2024 •

edited by MiguelCompany

Loading

mergify bot commented Jun 13, 2024 •

edited

Loading