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

[22519] Decouple transport receivers creation using unique network flows #5583

Merged
merged 5 commits into from
Jan 22, 2025

Conversation

juanlofer-eprosima
Copy link
Contributor

@juanlofer-eprosima juanlofer-eprosima commented Jan 20, 2025

Description

This is a follow-up of #5461, attempting to solve ros2/ros2#1617.

In that concrete scenario (where builtin + TCP transports are used in clients), the problem is that while the TCP (and UDP) transports are rightly able to create a receiver in the dedicated "unique flow" port, shared memory fails for that same port as the other process is already listening on it. However this was not being handled properly, so once matched, the publisher attempts to send data to the wrongfully announced shared memory locator.

Note that the underlying problem is that, when creating unique network flows, all transports are requested to create a receiver for a specific port all together. This is, the creation of unique flow receivers is only considered to fail when it fails for all transports, instead of decoupling them and keep trying for alternative ports when the creation of a specific transport receiver fails. The present PR fixes this behavior.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.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.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@juanlofer-eprosima juanlofer-eprosima requested review from richiprosima and removed request for richiprosima January 20, 2025 14:01
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 20, 2025
@juanlofer-eprosima juanlofer-eprosima requested review from richiprosima and removed request for richiprosima January 20, 2025 15:04
@cferreiragonz cferreiragonz added this to the v3.2.0 milestone Jan 21, 2025
@cferreiragonz
Copy link
Contributor

Tested that the PR solves issue ros2/ros2#1617 with Fast DDS 3.x and in Rolling with Fast DDS 2.14.x

Copy link
Contributor

@cferreiragonz cferreiragonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small NIT.

src/cpp/rtps/participant/RTPSParticipantImpl.cpp Outdated Show resolved Hide resolved
@juanlofer-eprosima juanlofer-eprosima requested review from richiprosima and removed request for richiprosima January 21, 2025 12:03
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@cferreiragonz cferreiragonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM too

@cferreiragonz cferreiragonz merged commit e6e918f into master Jan 22, 2025
17 checks passed
@cferreiragonz cferreiragonz deleted the bugfix/22519 branch January 22, 2025 08:24
@cferreiragonz cferreiragonz 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 Jan 22, 2025
@cferreiragonz
Copy link
Contributor

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Copy link
Contributor

mergify bot commented Jan 22, 2025

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)

# Conflicts:
#	test/blackbox/common/BlackboxTestsNetworkConf.cpp
mergify bot pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)
mergify bot pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)
mergify bot pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
#	test/blackbox/common/BlackboxTestsNetworkConf.cpp
cferreiragonz pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)

# Conflicts:
#	test/blackbox/common/BlackboxTestsNetworkConf.cpp
cferreiragonz pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)
cferreiragonz pushed a commit that referenced this pull request Jan 22, 2025
* Refs #22519. Add regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Decouple transport receivers creation using unique network flows

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Add comment for future developers

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #22519. Reuse unique ports for locators of same kind in a reader

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit e6e918f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
high-priority 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