[22756] Fix error handling logic in `try_setting_buffer_size` by MiguelCompany · Pull Request #5631 · eProsima/Fast-DDS

MiguelCompany · 2025-02-06T13:33:23Z

Description

This should fix #4684 by applying the last suggested changes

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
NO: 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.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

src/cpp/rtps/transport/asio_helpers.hpp

juanlofer-eprosima

LGTM

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany · 2025-02-10T18:49:04Z

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

mergify · 2025-02-10T18:49:11Z

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

Details

#5641 [22756] Fix error handling logic in try_setting_buffer_size (backport #5631) has been created for branch 3.1.x
#5642 [22756] Fix error handling logic in try_setting_buffer_size (backport #5631) has been created for branch 3.0.x
#5643 [22756] Fix error handling logic in try_setting_buffer_size (backport #5631) has been created for branch 2.14.x
#5644 [22756] Fix error handling logic in try_setting_buffer_size (backport #5631) has been created for branch 2.10.x but encountered conflicts

* Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 7259840)

* Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 7259840) # Conflicts: # src/cpp/rtps/transport/asio_helpers.hpp

* Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 7259840)

* Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 7259840) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

…, #5631) (#5563) * Handle socket buffer size setting when system's maximum exceeded (#5527) * Regression tests for asio_helpers socket buffer size Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Regression tests udp & tcp Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Refs #22210. Ensure that actual set value is returned by `asio_helpers::try_setting_buffer_size` Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix corner case infinite loop Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Uncrustify Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Fix UDP tests Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Fix windows compilation Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Applied suggestions to regression test Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Applied suggestions to udp tests Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> * Uncrustify Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> --------- Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> * Fix error handling logic in `try_setting_buffer_size` (#5631) * Refs #22208. Fix error handling logic in `try_setting_buffer_size`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22756. Apply suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix included headers Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Avoid using make_unique. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

Refs #22208. Fix error handling logic in try_setting_buffer_size.

261a8f4

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany added this to the v3.2.0 milestone Feb 6, 2025

MiguelCompany requested a review from richiprosima February 6, 2025 14:09

github-actions bot added the ci-pending PR which CI is running label Feb 6, 2025

MiguelCompany removed the request for review from richiprosima February 6, 2025 14:10

MiguelCompany mentioned this pull request Feb 7, 2025

[22208] The SocketTransportDescriptor::min_send_buffer_size() method returns too large value when exceeded net.core.wmem_max #4684

Closed

1 task

juanlofer-eprosima requested changes Feb 7, 2025

View reviewed changes

src/cpp/rtps/transport/asio_helpers.hpp Outdated Show resolved Hide resolved

juanlofer-eprosima previously approved these changes Feb 10, 2025

View reviewed changes

MiguelCompany requested review from richiprosima and removed request for richiprosima February 10, 2025 11:43

Refs #22756. Apply suggestion.

776d3eb

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany dismissed juanlofer-eprosima’s stale review via 776d3eb February 10, 2025 12:00

MiguelCompany force-pushed the hotfix/22208 branch from 2eec3ba to 776d3eb Compare February 10, 2025 12:00

MiguelCompany requested a review from juanlofer-eprosima February 10, 2025 12:01

juanlofer-eprosima approved these changes Feb 10, 2025

View reviewed changes

MiguelCompany merged commit 7259840 into master Feb 10, 2025
15 of 16 checks passed

MiguelCompany deleted the hotfix/22208 branch February 10, 2025 18:49

mergify bot mentioned this pull request Feb 10, 2025

[22756] Fix error handling logic in try_setting_buffer_size (backport #5631) #5641

Merged

11 tasks

This was referenced Feb 10, 2025

[22756] Fix error handling logic in try_setting_buffer_size (backport #5631) #5642

Merged

[22756] Fix error handling logic in try_setting_buffer_size (backport #5631) #5643

Merged

mergify bot mentioned this pull request Feb 10, 2025

[22756] Fix error handling logic in try_setting_buffer_size (backport #5631) #5644

Closed

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[22756] Fix error handling logic in `try_setting_buffer_size`#5631

[22756] Fix error handling logic in `try_setting_buffer_size`#5631
MiguelCompany merged 2 commits intomasterfrom
hotfix/22208

MiguelCompany commented Feb 6, 2025 •

edited by juanlofer-eprosima

Loading

Uh oh!

Uh oh!

juanlofer-eprosima left a comment

Uh oh!

MiguelCompany commented Feb 10, 2025

Uh oh!

mergify bot commented Feb 10, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

MiguelCompany commented Feb 6, 2025 • edited by juanlofer-eprosima Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

Uh oh!

juanlofer-eprosima left a comment

Choose a reason for hiding this comment

Uh oh!

MiguelCompany commented Feb 10, 2025

Uh oh!

mergify bot commented Feb 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MiguelCompany commented Feb 6, 2025 •

edited by juanlofer-eprosima

Loading

mergify bot commented Feb 10, 2025 •

edited

Loading