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

[20141] Fix TCP reconnection after open logical port failure #4324

Merged
merged 8 commits into from
Feb 21, 2024

Conversation

jepemi
Copy link
Contributor

@jepemi jepemi commented Jan 30, 2024

Description

When a client sends an openLogicalPortRequest while the server's input channels are already closed, it previously resulted in the deletion of the requested logical port from pending_logical_output_ports_, making server reconnection impossible. This update addresses the issue by ensuring that a port in pending_logical_output_ports_ is only removed if it is being transferred to the logical_output_ports_ vector. This change is enables effective server reconnection after an initial failure in an openLogicalPort request.

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

@jepemi jepemi added this to the v2.13.3 milestone Feb 1, 2024
@EduPonz EduPonz added the needs-review PR that is ready to be reviewed label Feb 6, 2024
@jepemi jepemi force-pushed the bugfix/tcp_fix_reconnection_pending_ports branch 2 times, most recently from 3817334 to c8a67a9 Compare February 19, 2024 11:25
@MiguelCompany
Copy link
Member

@jepemi Please address conflicts here

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@jepemi jepemi force-pushed the bugfix/tcp_fix_reconnection_pending_ports branch from c8a67a9 to 272e99a Compare February 21, 2024 08:25
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
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 with green CI

@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed needs-review PR that is ready to be reviewed labels Feb 21, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@EduPonz EduPonz 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 Feb 21, 2024
@EduPonz EduPonz merged commit 3db2db8 into master Feb 21, 2024
13 of 17 checks passed
@EduPonz EduPonz deleted the bugfix/tcp_fix_reconnection_pending_ports branch February 21, 2024 20:11
@EduPonz
Copy link

EduPonz commented Feb 21, 2024

@Mergifyio backport 2.12.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Feb 21, 2024

backport 2.12.x 2.10.x 2.6.x

✅ Backports have been created

jepemi added a commit that referenced this pull request Feb 28, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
jepemi added a commit that referenced this pull request Mar 1, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
jepemi added a commit that referenced this pull request Mar 1, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
jepemi added a commit that referenced this pull request Mar 11, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
MiguelCompany pushed a commit that referenced this pull request Mar 11, 2024
* Fix TCP reconnection after open logical port failure (#4324)

* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com>
Co-authored-by: Jesus Perez <jesusperez@eprosima.com>
jepemi added a commit that referenced this pull request Mar 13, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
elianalf pushed a commit that referenced this pull request Mar 14, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
elianalf pushed a commit that referenced this pull request Mar 18, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
MiguelCompany pushed a commit that referenced this pull request Mar 18, 2024
* Fix TCP reconnection after open logical port failure (#4324)

* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com>
Co-authored-by: Jesus Perez <jesusperez@eprosima.com>
jepemi added a commit that referenced this pull request Apr 10, 2024
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)
EduPonz pushed a commit that referenced this pull request Apr 16, 2024
* Fix TCP reconnection after open logical port failure (#4324)

* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 3db2db8)

* Refs #20141: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20141: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com>
Co-authored-by: Jesus Perez <jesusperez@eprosima.com>
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.

4 participants