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

[20508] TCP first message loss (backport #4454) #4563

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2024

Description

In the initial TCP logical port negotiation some logical port requests were missing. This would not prevent communication as those remaining requests would be sent on the first data sent to that logical port. However, that data would be discarded.

With this PR all discovered logical ports are requested on initialization and the first data would not need to be discarded.

@Mergifyio backport 2.13.x 2.12.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.
    Related documentation PR: [20508] TCP first message loss Fast-DDS-docs#699
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4454 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 15, 2024
Copy link
Contributor Author

mergify bot commented Mar 15, 2024

Cherry-pick of 8103cf0 has failed:

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

You are currently cherry-picking commit 8103cf042.
  (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/attributes/RTPSParticipantAttributes.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResource.h
	modified:   src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   include/fastdds/rtps/transport/TCPTransportDescriptor.h
	both modified:   include/fastrtps/xmlparser/XMLParserCommon.h
	both modified:   resources/xsd/fastRTPS_profiles.xsd
	both modified:   src/cpp/rtps/transport/TCPChannelResource.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
	both modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	both modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	both modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	both modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	both modified:   test/mock/rtps/TCPTransportDescriptor/fastrtps/transport/TCPTransportDescriptor.h
	deleted by us:   test/system/tools/xmlvalidation/XMLTesterExample_profile.xml
	deleted by us:   test/system/tools/xmlvalidation/all_profile.xml
	both modified:   test/unittest/transport/TCPv6Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	deleted by us:   test/unittest/transport/mock/MockTCPv6Transport.h
	both modified:   test/unittest/xmlparser/XMLParserTests.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 mentioned this pull request Mar 15, 2024
13 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Mar 15, 2024
@jepemi jepemi removed the conflicts Backport PR wich git cherry pick failed label Apr 8, 2024
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4454 branch from e5d65ee to 2a499a4 Compare April 8, 2024 08:42
@JesusPoderoso JesusPoderoso requested a review from Mario-DL April 8, 2024 08:43
@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 8, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@Mario-DL
Copy link
Member

@jepemi could you take a look to the conflicts here ? I think that this PR can be in for the upcoming release this week !

@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4454 branch from 2a499a4 to 6720de7 Compare April 23, 2024 12:09
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL April 23, 2024 12:36
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. The TransportTCP.large_data_topology.Transport fails in a couple of cis, I have occasionally seen it failing in another PRs. Just to be sure, I have run it multiple times in local (~20) and it did not fail. Approving !

@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 Apr 24, 2024
@MiguelCompany MiguelCompany merged commit 61bd873 into 2.6.x Apr 24, 2024
12 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4454 branch April 24, 2024 06:37
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