-
Notifications
You must be signed in to change notification settings - Fork 783
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
[21036] Handle errors when setting socket buffer sizes (backport #4760) (backport #4795) #4825
Conversation
Cherry-pick of 532acfa has failed:
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 |
* Refs #20972. Move code into new private methods. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor on configure_send_buffer_size. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor on configure_receive_buffer_size. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check user configuration at the beginning of init method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Use maxMessageSize as minimum possible value. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Applying changes on OpenAndBindUnicastOutputSocket. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Add helper header with template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Configure methods return boolean. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Configure methods use new template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. OpenAndBindUnicastOutputSocket uses new template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Changes in OpenAndBindInputSocket. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972.Setting options on TCP channels. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Doxygen. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check limits of configured sizes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Add UDP unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Add TCP unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Move checks in TCP to beginning of init. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor for common code in UDP. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor for common code in TCP. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Remove unused constants in UDP tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check final configuration on unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Less strict tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Remove `s_minimumSocketBuffer` from tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Deprecate `s_minimumSocketBuffer`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 532acfa)
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
6f43c32
to
dac08dd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with green discovery server ci. Failed tests unrelated
@richiprosima please test discovery-server |
Description
Note for backports:
s_minimumSocketBuffer
should be deprecated.Before this PR, setting too high a value for
sendBufferSize
orreceiveBufferSize
in a transport descriptor could lead to an error setting the buffer sizes. This error was silently discarded.The changes try to set the configured buffer size, halving it on an error until it gets the minimum allowed value (i.e. maxMessageSize).
@Mergifyio backport 2.10.x
Note: Since modifications need to be made on the backport, and the next patch release is 2.10.4, we will first
backport to 2.10.x, perform the modifications there, and then port to other supported branches.
Contributor Checklist
versions.md
file (if applicable).Reviewer Checklist
This is an automatic backport of pull request #4760 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #4795 done by [Mergify](https://mergify.com).