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

Merged
merged 5 commits into from
May 27, 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.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 mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 5, 2024
Copy link
Contributor Author

mergify bot commented Mar 5, 2024

Cherry-pick of fe11650 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

@jepemi jepemi changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4396 March 13, 2024 14:18
@jepemi jepemi added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 13, 2024
Base automatically changed from mergify/bp/2.6.x/pr-4396 to 2.6.x April 18, 2024 12:55
@Mario-DL
Copy link
Member

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

@Mario-DL Mario-DL self-requested a review April 23, 2024 12:40
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Apr 23, 2024

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 Mario-DL added the to-do label Apr 23, 2024
@Mario-DL Mario-DL modified the milestones: v2.6.8, v2.6.9 Apr 24, 2024
@Mario-DL
Copy link
Member

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

jepemi and others added 2 commits May 20, 2024 09:21
* 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>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL May 20, 2024 07:31
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL removed their request for review May 20, 2024 07:42
@Mario-DL Mario-DL self-requested a review May 20, 2024 07:42
@Mario-DL Mario-DL removed the to-do label May 20, 2024
@Mario-DL
Copy link
Member

@richiprosima please test this

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL removed their request for review May 24, 2024 10:22
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL Mario-DL self-requested a review May 24, 2024 10:22
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.

LGTM unrelated failed tests

@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 May 27, 2024
@EduPonz EduPonz merged commit 5ec373f into 2.6.x May 27, 2024
12 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4300 branch May 27, 2024 10:36
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