Skip to content

[23654] Change non_blocking_send threshold to sendBufferSize (backport #6073)#6079

Merged
juanlofer-eprosima merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-6073
Oct 8, 2025
Merged

[23654] Change non_blocking_send threshold to sendBufferSize (backport #6073)#6079
juanlofer-eprosima merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-6073

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 7, 2025

Description

Currently the non blocking size feature assumes that the size of TCP sockets allocated by the OS is twice the value requested (sendBufferSize). However, it has been observed that the actual reserved value may fall below that value, hence blocking when the buffer gets full and ruining the purpose of this feature.

@Mergifyio backport 3.3.x 3.2.x 2.14.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.

  • N/a Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #6073 done by [Mergify](https://mergify.com).

@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Oct 7, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 7, 2025

Cherry-pick of 81a5b12 has failed:

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

You are currently cherry-picking commit 81a5b12a.
  (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

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

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
(cherry picked from commit 81a5b12)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp
#	test/unittest/transport/TCPv6Tests.cpp
@juanlofer-eprosima juanlofer-eprosima force-pushed the mergify/bp/2.14.x/pr-6073 branch from 2e91a76 to c97666f Compare October 7, 2025 09:36
@juanlofer-eprosima juanlofer-eprosima removed the conflicts Backport PR wich git cherry pick failed label Oct 7, 2025
@github-actions github-actions Bot added the ci-pending PR which CI is running label Oct 7, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 7, 2025

🧪 CI Insights

Here's what we observed from your CI run for c97666f.

❌ Job Failures

Pipeline Job Health on 2.14.x Retries 🔍 CI Insights 📄 Logs
Fast-DDS MacOS CI mac-ci / reusable-mac-ci (RelWithDebInfo) Unknown 0 View View

Copy link
Copy Markdown
Contributor

@juanlofer-eprosima juanlofer-eprosima 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.

@juanlofer-eprosima juanlofer-eprosima merged commit ff2fefa into 2.14.x Oct 8, 2025
19 of 20 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/2.14.x/pr-6073 branch October 8, 2025 09:03
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.

2 participants