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

[20589] Set real TCP non_blocking_send limitation (backport #4502) #4631

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

Description

Since TCP actually allocates twice the size of the requested buffer, TCP non_blocking_send should not skip a send until this limit is reached.
This PR doubles the limit from which a send should not be tried if TCP non_blocking_send is set to true.

@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

  • N/A 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).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • 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 #4502 done by [Mergify](https://mergify.com).

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

mergify bot commented Mar 27, 2024

Cherry-pick of 33eb8be has failed:

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

You are currently cherry-picking commit 33eb8be4b.
  (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/transport/TCPChannelResource.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/transport/TCPv4Tests.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

@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Mar 29, 2024
@Mario-DL
Copy link
Member

@jepemi would you mind addressing the conflicts here ?

* Refs #20589: Set real non_blocking_send limitation

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20589: Readapt test

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20589: Fix failing test in macos/linux

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20589: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20589: Fix unused variable

Signed-off-by: Jesus Perez <[email protected]>

---------

Signed-off-by: Jesus Perez <[email protected]>
@jepemi jepemi added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Apr 23, 2024
@Mario-DL Mario-DL self-requested a review April 23, 2024 13:40
@Mario-DL
Copy link
Member

@richiprosima please test this

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. Failed tests are unrelated, going in

@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 764b1c3 into 2.6.x Apr 24, 2024
12 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4502 branch April 24, 2024 06:25
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