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

Revert "TCP deadlock on channel reuse (#4099)" (backport #4181) #4192

Merged
merged 1 commit into from
Jan 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 22, 2023

This is an automatic backport of pull request #4181 done by Mergify.
Cherry-pick of 5e87eb3 has failed:

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

You are currently cherry-picking commit 5e87eb3ac.
  (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/TCPTransportInterface.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	modified:   test/blackbox/common/TCPReqRepHelloWorldReplier.cpp
	modified:   test/blackbox/common/TCPReqRepHelloWorldReplier.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsTransportCustom.cpp
	deleted by us:   test/blackbox/xfail_tests.cmake

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 Dec 22, 2023
@cferreiragonz cferreiragonz added this to the v2.12.2 milestone Dec 22, 2023
@elianalf elianalf removed the conflicts Backport PR wich git cherry pick failed label Jan 4, 2024
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20055: Separate builtin transports tests into individual cases

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20055: Mark large_data tests as flaky due to TCP

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)
@cferreiragonz
Copy link
Contributor

The changes of #4181 corresponding to builtin transports have been cherry-picked to #4171 and deleted from this PR

@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed needs rebase labels Jan 11, 2024
@EduPonz
Copy link

EduPonz commented Jan 12, 2024

@richiprosima please test linux test mac test windows

@MiguelCompany MiguelCompany merged commit 930457e into 2.12.x Jan 30, 2024
9 of 12 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.12.x/pr-4181 branch January 30, 2024 14:15
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants