Skip to content

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

Merged
MiguelCompany merged 6 commits into2.13.xfrom
mergify/bp/2.13.x/pr-4187
May 28, 2024
Merged

[20351] Fix on_sample_lost notification on best-effort readers for framented samples (backport #4187)#4608
MiguelCompany merged 6 commits into2.13.xfrom
mergify/bp/2.13.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).

@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Mar 23, 2024
@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima please test mac

1 similar comment
@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima please test mac 🥲

@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added to-do and removed ci-pending PR which CI is running labels Mar 30, 2024
@JesusPoderoso JesusPoderoso modified the milestones: v2.13.4, v2.13.5 Apr 4, 2024
@MiguelCompany MiguelCompany added the temporarily-blocked PR must be merged after another one label May 20, 2024
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.13.x/pr-4187 branch from 041d5a2 to e33e1c4 Compare May 24, 2024 08:37
@MiguelCompany MiguelCompany changed the base branch from 2.13.x to mergify/bp/2.13.x/pr-4796 May 24, 2024 08:38
@MiguelCompany
Copy link
Copy Markdown
Member

I rebased on top of #4812, and changed the base branch on this one

@github-actions github-actions bot added the ci-pending PR which CI is running label May 24, 2024
* Refs #20972. Method socket_buffer_size in DDS_PIM helpers sets also sending buffer.

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

* Refs #20972. Method socket_buffer_size in fastrtps_deprecated helpers sets also sending buffer.

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

* Refs #20972. Improvements in on_sample_lost blackbox tests.

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

* 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. Applying changes on CreateInputChannelResource.

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

* Revert "Refs #20972. Applying changes on CreateInputChannelResource."

This reverts commit ed848e9.

* 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>
(cherry picked from commit 53cd211)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
#	src/cpp/rtps/transport/UDPTransportInterface.cpp
#	src/cpp/rtps/transport/UDPv4Transport.cpp
#	src/cpp/rtps/transport/UDPv6Transport.cpp
#	test/blackbox/common/DDSBlackboxTestsListeners.cpp
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.13.x/pr-4796 branch from 1822bdc to a4b4928 Compare May 24, 2024 14:58
… 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>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.13.x/pr-4187 branch from e33e1c4 to 050be91 Compare May 24, 2024 15:01
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso May 24, 2024 15:01
JesusPoderoso
JesusPoderoso previously approved these changes May 24, 2024
Copy link
Copy Markdown
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

Base automatically changed from mergify/bp/2.13.x/pr-4796 to 2.13.x May 27, 2024 12:35
@EduPonz EduPonz dismissed JesusPoderoso’s stale review May 27, 2024 12:35

The base branch was changed.

@JesusPoderoso JesusPoderoso removed the temporarily-blocked PR must be merged after another one label May 27, 2024
@JesusPoderoso JesusPoderoso self-requested a review May 27, 2024 12:44
Copy link
Copy Markdown
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@JesusPoderoso
Copy link
Copy Markdown
Contributor

CI issues unrelated to the PR
Ready to merge!

@JesusPoderoso JesusPoderoso 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 May 28, 2024
@MiguelCompany MiguelCompany merged commit 2987b88 into 2.13.x May 28, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.13.x/pr-4187 branch May 28, 2024 06:11
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