[20180] TCP Client&Server Participant Decision-Making (backport #4277)
This is an automatic backport of pull request #4277 done by Mergify. Cherry-pick of 709b1406b0a40876a98bcb66147c61dd98aadc1d has failed:
On branch mergify/bp/2.6.x/pr-4277
Your branch is up to date with 'origin/2.6.x'.
You are currently cherry-picking commit 709b1406b.
(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/fastdds/publisher/DataWriterImpl.cpp
modified: src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
modified: src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
modified: src/cpp/rtps/transport/TCPSenderResource.hpp
modified: src/cpp/rtps/transport/TCPTransportInterface.h
modified: src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
modified: test/blackbox/api/dds-pim/PubSubReader.hpp
modified: test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
modified: test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
modified: test/blackbox/common/BlackboxTests.hpp
modified: test/blackbox/common/BlackboxTestsTransportCustom.cpp
modified: test/blackbox/utils/data_generators.cpp
modified: test/unittest/dds/participant/ParticipantTests.cpp
modified: test/unittest/transport/TCPv4Tests.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/fastdds/publisher/DataWriterImpl.hpp
both modified: src/cpp/rtps/transport/TCPChannelResource.cpp
both modified: src/cpp/rtps/transport/TCPTransportInterface.cpp
both modified: test/blackbox/api/dds-pim/PubSubWriter.hpp
both modified: test/blackbox/common/BlackboxTestsTransportTCP.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 refreshwill re-evaluate the rules -
@Mergifyio rebasewill rebase this PR on its base branch -
@Mergifyio updatewill 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
I am asking for ci when the other TCP-related PRs are merged
- Merge after #4330
@richiprosima please test this
It seems that linux test failure may be related @cferreiragonz would you mind taking a look at this?
@richiprosima please test this
Failed tests in github cis are unrelated. Jenkins ci perfectly passed, giving it as ready to merge