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

jepemi · 2024-01-30T09:03:41Z

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.

MiguelCompany · 2024-02-21T07:45:24Z

@jepemi Please address conflicts here

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

test/unittest/transport/TCPv4Tests.cpp

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

MiguelCompany

LGTM with green CI

JesusPoderoso · 2024-02-21T13:00:55Z

@richiprosima please test this

EduPonz · 2024-02-21T20:11:45Z

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

mergify · 2024-02-21T20:11:50Z

backport 2.12.x 2.10.x 2.6.x

✅ Backports have been created

#4420 [20141] Fix TCP reconnection after open logical port failure (backport #4324) has been created for branch 2.12.x but encountered conflicts
#4421 [20141] Fix TCP reconnection after open logical port failure (backport #4324) has been created for branch 2.10.x but encountered conflicts
#4422 [20141] Fix TCP reconnection after open logical port failure (backport #4324) has been created for branch 2.6.x but encountered conflicts

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

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

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

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

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

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

jepemi added this to the v2.13.3 milestone Feb 1, 2024

EduPonz added the needs-review PR that is ready to be reviewed label Feb 6, 2024

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

JesusPoderoso requested a review from MiguelCompany February 20, 2024 08:00

jepemi added 6 commits February 21, 2024 09:19

Refs #20141: Relocate pending ports erasing

2d0ff78

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

Refs #20141: Add test

2c547cb

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

Refs #20141: Uncrustify

d0372f1

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

Refs #20141: Fix asan tests

5076406

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

Refs #20141: Changes after rebase

f2095a4

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

Refs #20141: Fix windows tests

272e99a

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

jepemi force-pushed the bugfix/tcp_fix_reconnection_pending_ports branch from c8a67a9 to 272e99a Compare February 21, 2024 08:25

Refs #20141: Uncrustify

e36dcb4

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

MiguelCompany requested changes Feb 21, 2024

View reviewed changes

test/unittest/transport/TCPv4Tests.cpp Outdated Show resolved Hide resolved

Refs #20141: Apply suggestions

d2e76a9

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

MiguelCompany approved these changes Feb 21, 2024

View reviewed changes

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

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 merged commit 3db2db8 into master Feb 21, 2024
13 of 17 checks passed

EduPonz deleted the bugfix/tcp_fix_reconnection_pending_ports branch February 21, 2024 20:11

mergify bot mentioned this pull request Feb 21, 2024

[20141] Fix TCP reconnection after open logical port failure (backport #4324) #4420

Merged

mergify bot mentioned this pull request Feb 21, 2024

[20141] Fix TCP reconnection after open logical port failure (backport #4324) #4421

Merged

mergify bot mentioned this pull request Feb 21, 2024

[20141] Fix TCP reconnection after open logical port failure (backport #4324) #4422

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jepemi commented Jan 30, 2024 •

edited by EduPonz

Loading

MiguelCompany commented Feb 21, 2024

MiguelCompany left a comment

JesusPoderoso commented Feb 21, 2024

EduPonz commented Feb 21, 2024

mergify bot commented Feb 21, 2024 •

edited

Loading

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

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

Conversation

jepemi commented Jan 30, 2024 • edited by EduPonz Loading

Description

Contributor Checklist

Reviewer Checklist

MiguelCompany commented Feb 21, 2024

MiguelCompany left a comment

Choose a reason for hiding this comment

JesusPoderoso commented Feb 21, 2024

EduPonz commented Feb 21, 2024

mergify bot commented Feb 21, 2024 • edited Loading

✅ Backports have been created

jepemi commented Jan 30, 2024 •

edited by EduPonz

Loading

mergify bot commented Feb 21, 2024 •

edited

Loading