Skip to content

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

Merged
MiguelCompany merged 2 commits into2.10.xfrom
mergify/bp/2.10.x/pr-4502
Apr 17, 2024
Merged

[20589] Set real TCP non_blocking_send limitation (backport #4502)#4630
MiguelCompany merged 2 commits into2.10.xfrom
mergify/bp/2.10.x/pr-4502

Conversation

@mergify
Copy link
Copy Markdown
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
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of 33eb8be has failed:

On branch mergify/bp/2.10.x/pr-4502
Your branch is up to date with 'origin/2.10.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 27, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Mar 29, 2024
@MiguelCompany
Copy link
Copy Markdown
Member

@jepemi Could you fix the conflicts here?

* Refs #20589: Set real non_blocking_send limitation

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20589: Readapt test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

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

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20589: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20589: Fix unused variable

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 33eb8be)
@jepemi jepemi force-pushed the mergify/bp/2.10.x/pr-4502 branch from 77fb866 to e7c0b9a Compare April 15, 2024 07:33
@jepemi jepemi added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Apr 15, 2024
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@MiguelCompany MiguelCompany self-requested a review April 15, 2024 07:44
@MiguelCompany MiguelCompany merged commit 2101dbf into 2.10.x Apr 17, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4502 branch April 17, 2024 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants