[20628] Fix Discovery Server over TCP using logical port #4584

cferreiragonz · 2024-03-19T10:29:38Z

Description

This PR fixes a couple of bugs appearing when launching Discovery Server with TCP.

After the latest changes introduced to TCP with the Large Data feature, a DS client with one listening port could skip the channel creation and wait for the DS server to connect to it (which will never happen), as if it was a LARGE_DATA use case. A DS client must always create a CONNECT channel to the DS server.
The timer event that sends the pings to remote servers was not being restarted after updating the remote server list, what was causing a failure in the participant discovery.
It avoids the creation of unnecessary channels when updating the attributes to add new servers.

Additionally, it enables to set the logical port to zero when using DS, which will set the logical port to a value equal to the physical port. This simplifies the configuration required for using DS and is coherent with the logic implement in the CLI and the ROS_DISCOVERY_SERVER environment variable, where the logical port is always set to same value as the physical port.

@Mergifyio backport 2.10.x 2.6.x

This PR is on top of [20508] TCP first message loss (backport #4454) #4560 and needs to be merged after it. The same logic applies to the corresponding backports.

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
Any new/modified methods have been properly documented using Doxygen.
Changes are ABI compatible.
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.

MiguelCompany · 2024-04-03T07:17:55Z

@cferreiragonz This has conflicts, would you mind fixing them?

Signed-off-by: cferreiragonz <[email protected]>

src/cpp/rtps/transport/TCPTransportInterface.cpp

src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp

src/cpp/rtps/participant/RTPSParticipantImpl.cpp

src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp

src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp

Signed-off-by: cferreiragonz <[email protected]>

src/cpp/rtps/participant/RTPSParticipantImpl.h

Signed-off-by: cferreiragonz <[email protected]>

MiguelCompany

LGTM with green CI

MiguelCompany · 2024-04-03T13:30:47Z

@cferreiragonz Windows has build warnings

    DDSBlackboxTestsDiscovery.cpp
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(230,50): error C2220: the following warning is treated as an error [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(230,50): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(236,37): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(256,50): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(262,37): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(282,51): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]
  D:\a\Fast-DDS\Fast-DDS\src\fastrtps\test\blackbox\common\DDSBlackboxTestsDiscovery.cpp(297,51): warning C4244: 'argument': conversion from 'uint32_t' to 'uint16_t', possible loss of data [D:\a\Fast-DDS\Fast-DDS\build\fastrtps\test\blackbox\BlackboxTests_DDS_PIM.vcxproj]

Signed-off-by: cferreiragonz <[email protected]>

MiguelCompany · 2024-04-03T15:18:08Z

@richiprosima Please test this

JesusPoderoso · 2024-04-04T09:14:17Z

CI issues looks unrelated to the PR to me.
Ready to merge!

MiguelCompany · 2024-04-04T10:48:32Z

@Mergifyio backport 2.10.x 2.6.x

mergify · 2024-04-04T10:49:54Z

backport 2.10.x 2.6.x

✅ Backports have been created

#4655 [20628] Fix Discovery Server over TCP using logical port (backport #4584) has been created for branch 2.10.x but encountered conflicts
#4656 [20628] Fix Discovery Server over TCP using logical port (backport #4584) has been created for branch 2.6.x but encountered conflicts

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c) # Conflicts: # src/cpp/rtps/participant/RTPSParticipantImpl.cpp # src/cpp/rtps/transport/TCPTransportInterface.cpp

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c)

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c) Co-authored-by: Carlos Ferreira González <[email protected]>

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c)

* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c) Co-authored-by: Carlos Ferreira González <[email protected]>

cferreiragonz added needs-review PR that is ready to be reviewed temporarily-blocked PR must be merged after another one labels Mar 19, 2024

cferreiragonz added this to the v2.13.4 milestone Mar 19, 2024

cferreiragonz force-pushed the bugfix/tcp_disc_server_2.13 branch 2 times, most recently from 44a3acd to 2753aaf Compare March 20, 2024 09:11

cferreiragonz changed the title ~~[20628] Fix Discovery Server over TCP~~ [20628] Fix Discovery Server over TCP using logical port Mar 20, 2024

JesusPoderoso force-pushed the mergify/bp/2.13.x/pr-4454 branch from 5ee5393 to b8d7702 Compare March 23, 2024 19:03

jepemi force-pushed the mergify/bp/2.13.x/pr-4454 branch from b8d7702 to 673328e Compare March 25, 2024 15:30

Base automatically changed from mergify/bp/2.13.x/pr-4454 to 2.13.x March 28, 2024 08:37

JesusPoderoso removed the temporarily-blocked PR must be merged after another one label Mar 29, 2024

cferreiragonz added 8 commits April 3, 2024 09:43

Refs #20628: Update OpenOutputChannel

7990446

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Refactor PDPClient to handle initial TPC connections

598bf09

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Configuration to use logical port 0 as default in DS

f6c41bc

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Refactor PDPServer to handle initial TPC connections

eb59ca3

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Add TCP DS blackbox test

f4f180d

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Uncrustify

c9dc0dc

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Check transport in function

3614ab0

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Check interface changes before creating new send resources

d5a6499

Signed-off-by: cferreiragonz <[email protected]>

cferreiragonz force-pushed the bugfix/tcp_disc_server_2.13 branch from 2753aaf to d5a6499 Compare April 3, 2024 07:43

MiguelCompany requested changes Apr 3, 2024

View reviewed changes

Refs #20628: Minor corrections

fb03491

Signed-off-by: cferreiragonz <[email protected]>

MiguelCompany requested changes Apr 3, 2024

View reviewed changes

src/cpp/rtps/participant/RTPSParticipantImpl.h Outdated Show resolved Hide resolved

cferreiragonz added 2 commits April 3, 2024 14:06

Refs #20628: Check loc.kind and methods in RTPSPartImpl

ccc44e6

Signed-off-by: cferreiragonz <[email protected]>

Refs #20628: Check loc.kind for default logical port

05dc318

Signed-off-by: cferreiragonz <[email protected]>

cferreiragonz force-pushed the bugfix/tcp_disc_server_2.13 branch from ff26f6d to 05dc318 Compare April 3, 2024 12:09

MiguelCompany self-requested a review April 3, 2024 12:32

github-actions bot added the ci-pending PR which CI is running label Apr 3, 2024

MiguelCompany previously approved these changes Apr 3, 2024

View reviewed changes

MiguelCompany removed the needs-review PR that is ready to be reviewed label Apr 3, 2024

Refs #20628: Fix windows

16d64e2

Signed-off-by: cferreiragonz <[email protected]>

cferreiragonz dismissed MiguelCompany’s stale review via 16d64e2 April 3, 2024 13:39

MiguelCompany self-requested a review April 3, 2024 13:43

JesusPoderoso added the first-to-merge label Apr 4, 2024

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 Apr 4, 2024

MiguelCompany merged commit 9ff962c into 2.13.x Apr 4, 2024
13 of 16 checks passed

MiguelCompany deleted the bugfix/tcp_disc_server_2.13 branch April 4, 2024 10:48

This was referenced Apr 4, 2024

[20628] Fix Discovery Server over TCP using logical port (backport #4584) #4655

Merged

[20628] Fix Discovery Server over TCP using logical port (backport #4584) #4656

Merged

cferreiragonz mentioned this pull request Jun 14, 2024

[20650] Create InitialConnection for TCP initial peers 2.13 & 2.10 & 2.6 #4947

Merged

10 tasks

This was referenced Jun 27, 2024

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

Open

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[20628] Fix Discovery Server over TCP using logical port #4584

[20628] Fix Discovery Server over TCP using logical port #4584

cferreiragonz commented Mar 19, 2024 •

edited by JesusPoderoso

Loading

MiguelCompany commented Apr 3, 2024

MiguelCompany left a comment

MiguelCompany commented Apr 3, 2024

MiguelCompany commented Apr 3, 2024

JesusPoderoso commented Apr 4, 2024

MiguelCompany commented Apr 4, 2024

mergify bot commented Apr 4, 2024 •

edited

Loading

[20628] Fix Discovery Server over TCP using logical port #4584

[20628] Fix Discovery Server over TCP using logical port #4584

Conversation

cferreiragonz commented Mar 19, 2024 • edited by JesusPoderoso Loading

Description

Contributor Checklist

Reviewer Checklist

MiguelCompany commented Apr 3, 2024

MiguelCompany left a comment

Choose a reason for hiding this comment

MiguelCompany commented Apr 3, 2024

MiguelCompany commented Apr 3, 2024

JesusPoderoso commented Apr 4, 2024

MiguelCompany commented Apr 4, 2024

mergify bot commented Apr 4, 2024 • edited Loading

✅ Backports have been created

cferreiragonz commented Mar 19, 2024 •

edited by JesusPoderoso

Loading

mergify bot commented Apr 4, 2024 •

edited

Loading