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

[20120] TCPSendResources cleanup (backport #4300) #4512

Merged
merged 2 commits into from
Mar 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2024

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

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

You are currently cherry-picking commit fe116500c.
  (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/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/transport/UDPSenderResource.hpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   test/blackbox/common/DatagramInjectionTransport.cpp
	modified:   test/blackbox/common/DatagramInjectionTransport.hpp
	modified:   test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
	modified:   test/unittest/rtps/security/CMakeLists.txt
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPSenderResource.hpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	both modified:   test/unittest/rtps/discovery/CMakeLists.txt
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/transport/CMakeLists.txt
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	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/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

Copy link
Contributor Author

mergify bot commented Mar 5, 2024

Cherry-pick of fe11650 has failed:

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

You are currently cherry-picking commit fe116500c.
  (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/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/transport/UDPSenderResource.hpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   test/blackbox/common/DatagramInjectionTransport.cpp
	modified:   test/blackbox/common/DatagramInjectionTransport.hpp
	modified:   test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
	modified:   test/unittest/rtps/security/CMakeLists.txt
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPSenderResource.hpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	both modified:   test/unittest/rtps/discovery/CMakeLists.txt
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/transport/CMakeLists.txt
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 5, 2024
@mergify mergify bot mentioned this pull request Mar 5, 2024
12 tasks
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Mar 6, 2024
@jepemi jepemi changed the base branch from 2.10.x to mergify/bp/2.10.x/pr-4396 March 11, 2024 13:18
@jepemi
Copy link
Contributor

jepemi commented Mar 11, 2024

@cferreiragonz cferreiragonz added ci-pending PR which CI is running temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed needs rebase labels Mar 11, 2024
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.10.x/pr-4396 branch 2 times, most recently from f90dc32 to 43406b3 Compare March 12, 2024 07:34
Base automatically changed from mergify/bp/2.10.x/pr-4396 to 2.10.x March 12, 2024 19:20
@jepemi
Copy link
Contributor

jepemi commented Mar 13, 2024

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Mar 13, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]

@MiguelCompany MiguelCompany removed the temporarily-blocked PR must be merged after another one label Mar 13, 2024
MiguelCompany
MiguelCompany previously approved these changes Mar 13, 2024
@MiguelCompany
Copy link
Member

@Mergifyio rebase

* Refs #20120: Remove unused include

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

* Refs #20120: TCP event call

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

* Refs #20120: Sanitize transport

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

* Refs #20120: Added tests and minor fixes

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

* Refs #20120: Extended doxygen description and added to versions.md

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

* Refs #20120: Uncrustify

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

* Refs #20120: Add missing header

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

* Refs #20120: Fix tests

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

* Refs #20120: Uncrustify

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

* Refs #20120: After client-server decision making rebase, not working

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

* Refs #20120: Update

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

* Refs #20120: Fix for chaining-transports

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

* Refs #20120: Add new channel connection status and tests

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

* Refs #20120: PR refactor, timed event deleted. cleanup on pdp unbinding

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

* Refs #20120: Uncrustify

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

* Refs #20120: Add unittests

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

* Refs #20120: Fix deadlock

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

* Refs #20120: Fix unittest

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

* Refs #20120: Fix asio throwing exceptions

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

* Refs #20120: Unnittest untab

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

* Refs #20120: Apply suggestions

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

* Refs #20120: Uncrustify

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

* Refs #20120: Consider wan case + associated tests

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

* Refs #20120: Remove versions.md update

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

* Refs #20120: Fix rebasing wrong deletion

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

* Refs #20120: Delete assert clause

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

* Refs #20120: Apply suggestions

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

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>

Refs #20120: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Copy link
Contributor Author

mergify bot commented Mar 14, 2024

rebase

✅ Branch has been successfully rebased

@MiguelCompany
Copy link
Member

@richiprosima Please test this

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 98fb9a9 into 2.10.x Mar 15, 2024
10 of 15 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4300 branch March 15, 2024 12:11
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