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

[22210] Handle socket buffer size setting when system's maximum exceeded #5527

Merged
merged 10 commits into from
Jan 10, 2025

Conversation

EugenioCollado
Copy link
Contributor

@EugenioCollado EugenioCollado commented Dec 26, 2024

Description

This PR fixes the socket buffer size configuration mechanism. Previously, the try_setting_buffer_size method relied on the error code returned by the ASIO API to verify successful changes, which proved unreliable as no error code was returned even when the operation failed. The method has been updated to validate the buffer size by checking the actual size after setting the option, ensuring correct configuration or at least returning the actual final_buffer_value.

@Mergifyio backport 3.1.x 3.0.x 2.14.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
  • NA: Any new/modified methods have been properly documented using Doxygen.
  • NA: 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.
  • NA: New feature has been added to the versions.md file (if applicable).
  • NA: 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.

EugenioCollado and others added 4 commits December 26, 2024 12:57
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
…s::try_setting_buffer_size`

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado added this to the v3.2.0 milestone Dec 26, 2024
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado added the ci-pending PR which CI is running label Dec 26, 2024
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado removed the request for review from richiprosima December 27, 2024 11:29
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed ci-pending PR which CI is running labels Dec 27, 2024
@EugenioCollado EugenioCollado added needs-review PR that is ready to be reviewed and removed ci-pending PR which CI is running labels Dec 31, 2024
test/unittest/transport/AsioHelpersTests.cpp Show resolved Hide resolved
test/unittest/transport/UDPv4Tests.cpp Outdated Show resolved Hide resolved
test/unittest/transport/UDPv6Tests.cpp Outdated Show resolved Hide resolved
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado requested review from richiprosima and removed request for richiprosima January 7, 2025 06:26
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 7, 2025
@MiguelCompany
Copy link
Member

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

Copy link
Contributor

mergify bot commented Jan 10, 2025

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

✅ Backports have been created

@EugenioCollado EugenioCollado merged commit 5fc7786 into master Jan 10, 2025
17 checks passed
@EugenioCollado EugenioCollado deleted the bugfix/22210 branch January 10, 2025 09:17
mergify bot pushed a commit that referenced this pull request Jan 10, 2025
* 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>
(cherry picked from commit 5fc7786)
mergify bot pushed a commit that referenced this pull request Jan 10, 2025
* 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>
(cherry picked from commit 5fc7786)
mergify bot pushed a commit that referenced this pull request Jan 10, 2025
* 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>
(cherry picked from commit 5fc7786)
mergify bot pushed a commit that referenced this pull request Jan 10, 2025
* 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>
(cherry picked from commit 5fc7786)

# Conflicts:
#	test/unittest/transport/CMakeLists.txt
mergify bot pushed a commit that referenced this pull request Jan 10, 2025
* 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>
(cherry picked from commit 5fc7786)

# Conflicts:
#	test/unittest/transport/CMakeLists.txt
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 needs-review PR that is ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants