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) #4422

Merged
merged 3 commits into from
Apr 16, 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.6.x/pr-4324
Your branch is up to date with 'origin/2.6.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/rm <file>..." as appropriate 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
	deleted by us:   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.6.8 milestone Feb 22, 2024
@Mario-DL
Copy link
Member

@jepemi would you mind taking a look at the conflicts ?
Also, take advantage to rebase, so that we have both windows & mac on github working for this branch

@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4324 branch from da8dc80 to 21be33e Compare February 28, 2024 14:18
@jepemi jepemi changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4297 February 28, 2024 14:18
@jepemi
Copy link
Contributor

jepemi commented Feb 28, 2024

@cferreiragonz cferreiragonz added temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed labels Mar 26, 2024
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4297 branch from 9ece5b6 to c98e924 Compare April 1, 2024 12:28
Base automatically changed from mergify/bp/2.6.x/pr-4297 to 2.6.x April 10, 2024 06:32
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed temporarily-blocked PR must be merged after another one labels Apr 10, 2024
@Mario-DL
Copy link
Member

@jepemi next one in the loop ! Would you mind addressing the conflicts here ?

jepemi and others added 3 commits April 10, 2024 09:21
* Refs #20141: Relocate pending ports erasing

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Add test

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Fix asan tests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Changes after rebase

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Fix windows tests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20141: Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

---------

Signed-off-by: Jesus Perez <[email protected]>
(cherry picked from commit 3db2db8)
Signed-off-by: Jesus Perez <[email protected]>
Signed-off-by: Jesus Perez <[email protected]>
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4324 branch from 21be33e to c077af7 Compare April 10, 2024 07:29
@jepemi jepemi removed the ci-pending PR which CI is running label Apr 10, 2024
@Mario-DL Mario-DL added the ci-pending PR which CI is running label Apr 10, 2024
@Mario-DL Mario-DL self-requested a review April 10, 2024 07:32
@Mario-DL
Copy link
Member

@richiprosima please test this

Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

Failed tests unrelated to this PR. LGTM

@Mario-DL Mario-DL 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 Apr 11, 2024
@EduPonz EduPonz merged commit 5fe3b60 into 2.6.x Apr 16, 2024
10 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4324 branch April 16, 2024 06:05
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.

5 participants