Skip to content

[20351] Fix on_sample_lost notification on best-effort readers for framented samples (backport #4187)#4607

Merged
EduPonz merged 5 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4187
Jun 28, 2024
Merged

[20351] Fix on_sample_lost notification on best-effort readers for framented samples (backport #4187)#4607
EduPonz merged 5 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4187

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 22, 2024

Description

When some fragments are lost on every sample, best-effort readers were not notifying on_sample_lost events.

@Mergifyio backport 2.12.x 2.11.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

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • Changes are ABI compatible.

  • 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.
  • Check contributor checklist is correct.
  • 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 #4187 done by [Mergify](https://mergify.com).

@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test this

mergify bot and others added 2 commits June 26, 2024 11:12
* 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>
@MiguelCompany MiguelCompany changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4795 June 26, 2024 09:14
… samples (#4187)

* Refs #20162. Regression test.

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

* Refs #20162. Notify sample lost when dropping fragmented change.

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

* Refs #20167. Linters.

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

* Refs #20162. Apply suggestions.

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

* Refs #20162. Use constexpr for buffer size.

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

* Refs #20162. Lower buffer size.

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

* Refs #20351. Uncrustify.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 5ac198e)
* Refs #20692. Make sample_lost_be_dw_be_dr_fragments test less flakey.

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

* Refs #20692. Uncrustify.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-4187 branch from b56e748 to f6d6b16 Compare June 26, 2024 09:16
@MiguelCompany MiguelCompany removed their assignment Jun 26, 2024
@MiguelCompany MiguelCompany added the temporarily-blocked PR must be merged after another one label Jun 26, 2024
@MiguelCompany
Copy link
Copy Markdown
Member

This one now depends on #4825

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-4187 branch from fe54357 to 8b13ed6 Compare June 26, 2024 09:37
@Mario-DL Mario-DL self-requested a review June 26, 2024 11:27
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 26, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

Sorry, saw the comment after requesting ci, I will abort and w8 for the other

Base automatically changed from mergify/bp/2.6.x/pr-4795 to 2.6.x June 27, 2024 06:16
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 27, 2024 06:49
@Mario-DL Mario-DL removed the temporarily-blocked PR must be merged after another one label Jun 27, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test discovery-server

Copy link
Copy Markdown
Contributor

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed tests are unrelated to the PR

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 27, 2024
@EduPonz EduPonz merged commit b64e40e into 2.6.x Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants