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

[18002] Internal refactor on port handling (backport #3440) #4697

Merged
merged 1 commit into from
May 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2024

Description

This PR refactors the constructor of RTPSParticipantImpl, and changes the calculation of the ports used when set to 0 on the input locators.

@Mergifyio backport 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.

  • 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.

  • 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.
  • 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 #3440 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 17, 2024
Copy link
Contributor Author

mergify bot commented Apr 17, 2024

Cherry-pick of ea5af48 has failed:

On branch mergify/bp/2.13.x/pr-3440
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit ea5af48d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   test/blackbox/common/BlackboxTestsTransportSHM.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/network/NetworkFactory.h
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@JesusPoderoso JesusPoderoso added this to the v2.13.5 milestone Apr 17, 2024
* Refs #18002. Avoid mutation of multicast ports.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Move security initalization up.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Prepare for refactor of locators setup.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Refactor metatraffic related code.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Refactor initial peers related code.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Refactor user traffic related code.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Refactor output traffic related code.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Safe metatraffic unicast port on a new attribute.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. User unicast port calculated on participant instead of NetworkFactory.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18002. Update metatraffic_unicast_port_ inside applyLocatorAdaptRule.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Apply suggestion

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18002. Always create unicast receiver resources first.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18002. Improve warning message.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18002. Refactor createReceiverResources

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18002. Improve SHM.SamePortUnicastMulticast blackbox test

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit ea5af48)
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.13.x/pr-3440 branch from 67c614a to 5b6bc33 Compare May 14, 2024 11:01
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label May 14, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label May 14, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the backport content.
Ready to merge!

@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 May 20, 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

@MiguelCompany MiguelCompany merged commit 60b6242 into 2.13.x May 20, 2024
15 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.13.x/pr-3440 branch May 20, 2024 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

2 participants