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

[20179] TCP unique client announced local port (backport #4216) #4287

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2024

This is an automatic backport of pull request #4216 done by Mergify.
Cherry-pick of b43f3a0 has failed:

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

You are currently cherry-picking commit b43f3a065.
  (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/tcp/RTCPMessageManager.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp
	modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	new file:   test/unittest/transport/mock/MockTCPv6Transport.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/unittest/transport/TCPv6Tests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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 Jan 24, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Jan 24, 2024
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 24, 2024
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4216 branch from 82369c2 to 0786256 Compare January 24, 2024 12:06
@JesusPoderoso
Copy link
Contributor

@richiprosima plase test this

@Mario-DL
Copy link
Member

@jepemi would you mind rebasing here as well ?

@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4216 branch from 0786256 to 869217d Compare February 23, 2024 12:12
@jepemi
Copy link
Contributor

jepemi commented Feb 23, 2024

@jepemi jepemi changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4258 February 23, 2024 12:12
Base automatically changed from mergify/bp/2.6.x/pr-4258 to 2.6.x March 6, 2024 10:03
@Mario-DL
Copy link
Member

Mario-DL commented Mar 7, 2024

@jepemi would you mind rebasing over 2.6.x here ? I checked in local and there are some conflicts

jepemi and others added 2 commits March 7, 2024 10:03
* Refs #20179: Guarantee unique announced client local port

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

* Refs #20179: Regression tests

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

* Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken)

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

* Refs #20179: Uncrustify

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

* Refs #20179: Fix windows release tests

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

* Refs #20179: Apply sugestions

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

* Refs #20179: Uncrustify

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

---------

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

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
#	src/cpp/rtps/transport/TCPTransportInterface.h
#	test/unittest/transport/TCPv6Tests.cpp
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4216 branch from 869217d to 8c1bfe5 Compare March 7, 2024 09:27
@Mario-DL
Copy link
Member

Mario-DL commented Mar 7, 2024

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Mar 8, 2024

Thread sanitizer passed but got stuck at the post-setup ccache step. Windows github v141 runs on flaky tests but jenkins correctly addressed them. Mac jenkins failed tests are unrelated. Ready to merge

@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 Mar 8, 2024
@EduPonz EduPonz merged commit ecca94c into 2.6.x Mar 18, 2024
9 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4216 branch March 18, 2024 15:06
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