Fast-DDS icon indicating copy to clipboard operation
Fast-DDS copied to clipboard

[20120] TCPSendResources cleanup (backport #4300)

Open mergify[bot] opened this issue 1 year ago • 8 comments

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

On branch mergify/bp/2.6.x/pr-4300
Your branch is up to date with 'origin/2.6.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:   include/fastdds/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	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
	modified:   test/unittest/transport/TCPv4Tests.cpp
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	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/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

mergify[bot] avatar Mar 05 '24 19:03 mergify[bot]

Cherry-pick of fe116500cbfd873964f47033630c07001a76bbce has failed:

On branch mergify/bp/2.6.x/pr-4300
Your branch is up to date with 'origin/2.6.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:   include/fastdds/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	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
	modified:   test/unittest/transport/TCPv4Tests.cpp
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	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/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[bot] avatar Mar 05 '24 19:03 mergify[bot]

Merge after:

  • #4555
  • #4434

jepemi avatar Mar 11 '24 10:03 jepemi

@jepemi as a stretch goal, we may merge this one if we manage to solve the conflicts and successfully run ci

Mario-DL avatar Apr 23 '24 08:04 Mario-DL

@richiprosima please test this

Mario-DL avatar Apr 23 '24 12:04 Mario-DL

Windows CI complains about a missing include asio.hpp in IPLocator.cpp:23(http://jenkins.eprosima.com:8080/job/fastdds_windows/label=windows-secure,toolset=v142/6132/msbuild/) probably due to the cleaning in the CMakelists.txt that removed some {Asio_include_dir}, if we are today on time of reviewing it and relaunch ci, nice. Otherwise it will be left for the next milestone

Mario-DL avatar Apr 23 '24 14:04 Mario-DL

@jepemi would you mind taking a look at this ? We are close to merging

Mario-DL avatar Apr 30 '24 06:04 Mario-DL

@richiprosima please test this

Mario-DL avatar May 20 '24 10:05 Mario-DL

@richiprosima please test this

Mario-DL avatar May 24 '24 10:05 Mario-DL