Skip to content

[22756] Fix error handling logic in try_setting_buffer_size #5631

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 10, 2025
Merged

[22756] Fix error handling logic in try_setting_buffer_size #5631

merged 2 commits into from
Feb 10, 2025

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Feb 6, 2025 •
edited by juanlofer-eprosima
Loading

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.

@MiguelCompany
Refs #22208. Fix error handling logic in try_setting_buffer_size.
261a8f4 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v3.2.0 milestone Feb 6, 2025
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 6, 2025
@MiguelCompany MiguelCompany removed the request for review from richiprosima February 6, 2025 14:10
@MiguelCompany MiguelCompany mentioned this pull request Feb 7, 2025
Closed
1 task
juanlofer-eprosima
juanlofer-eprosima requested changes Feb 7, 2025
View reviewed changes
juanlofer-eprosima
juanlofer-eprosima previously approved these changes Feb 10, 2025
View reviewed changes
Copy link
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

@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima February 10, 2025 11:43
@MiguelCompany
Refs #22756. Apply suggestion.
776d3eb 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Copy link
Member Author

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 10, 2025 •
edited
Loading

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

✅ Backports have been created

@MiguelCompany MiguelCompany merged commit 7259840 into master Feb 10, 2025
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/22208 branch February 10, 2025 18:49
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
@MiguelCompany @mergify
Fix error handling logic in try_setting_buffer_size (#5631)
f32d434 
* 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)
@mergify mergify bot mentioned this pull request Feb 10, 2025
Merged
11 tasks
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
@MiguelCompany @mergify
Fix error handling logic in try_setting_buffer_size (#5631)
8177ea3 
* 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)
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
@MiguelCompany @mergify
Fix error handling logic in try_setting_buffer_size (#5631)
ce188d3 
* 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)
This was referenced Feb 10, 2025
Merged
Merged
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
@MiguelCompany @mergify
Fix error handling logic in try_setting_buffer_size (#5631)
8275651 
* 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
@mergify mergify bot mentioned this pull request Feb 10, 2025
Closed
11 tasks
Javgilavi pushed a commit that referenced this pull request Feb 11, 2025
@MiguelCompany @Javgilavi
Fix error handling logic in try_setting_buffer_size (#5631)
54f8382 
* 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)
MiguelCompany added a commit that referenced this pull request Feb 11, 2025
@mergify @MiguelCompany
Fix error handling logic in try_setting_buffer_size (#5631) (#5641)
23c24c4 
* 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>
Javgilavi pushed a commit that referenced this pull request Feb 12, 2025
@mergify @MiguelCompany
Fix error handling logic in try_setting_buffer_size (#5631) (#5642)
90890a8 
* 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>
EugenioCollado pushed a commit that referenced this pull request Feb 17, 2025
@mergify @MiguelCompany
Fix error handling logic in try_setting_buffer_size (#5631) (#5643)
e6d0844 
* 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>
MiguelCompany added a commit that referenced this pull request May 29, 2025
@MiguelCompany
Fix error handling logic in try_setting_buffer_size (#5631)
22d90bb 
* 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>
MiguelCompany added a commit that referenced this pull request May 29, 2025
@mergify @EugenioCollado @MiguelCompany
Handle socket buffer size setting when system's maximum exceeded (#5527…
6e56837 
…, #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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juanlofer-eprosima juanlofer-eprosima juanlofer-eprosima approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v3.2.0 - Frozen ❄️
Development

Successfully merging this pull request may close these issues.

[22208] The SocketTransportDescriptor::min_send_buffer_size() method returns too large value when exceeded net.core.wmem_max
2 participants
@MiguelCompany @juanlofer-eprosima