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 (backport #4324) #4420

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2024

This is an automatic backport of pull request #4324 done by Mergify.
Cherry-pick of 3db2db8 has failed:

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

You are currently cherry-picking commit 3db2db893.
  (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/transport/TCPChannelResource.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	both modified:   test/unittest/transport/mock/MockTCPv6Transport.h

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 21, 2024
@JesusPoderoso JesusPoderoso added this to the v2.12.2 milestone Feb 22, 2024
@cferreiragonz cferreiragonz added the temporarily-blocked PR must be merged after another one label Mar 1, 2024
@jepemi jepemi force-pushed the mergify/bp/2.12.x/pr-4324 branch from 35132c9 to aa3d320 Compare March 1, 2024 13:14
@jepemi jepemi changed the base branch from 2.12.x to mergify/bp/2.12.x/pr-4297 March 1, 2024 13:14
@jepemi
Copy link
Contributor

jepemi commented Mar 1, 2024

@jepemi jepemi added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 1, 2024
Base automatically changed from mergify/bp/2.12.x/pr-4297 to 2.12.x March 13, 2024 14:52
@cferreiragonz cferreiragonz removed the temporarily-blocked PR must be merged after another one label Mar 13, 2024
@elianalf
Copy link
Contributor

@richiprosima please test this

@elianalf elianalf added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Mar 14, 2024
@elianalf elianalf modified the milestones: v2.12.2 - Frozen, v2.12.3 Mar 14, 2024
@elianalf elianalf modified the milestones: v2.12.3, v2.12.2 - Frozen Mar 14, 2024
jepemi and others added 2 commits March 18, 2024 08:02
* 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)
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@elianalf
Copy link
Contributor

@richiprosima please test this

@elianalf elianalf added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Mar 18, 2024
@MiguelCompany MiguelCompany merged commit 7686b83 into 2.12.x Mar 18, 2024
13 of 15 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.12.x/pr-4324 branch March 18, 2024 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running 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.

5 participants