[21519] Fix issue with exclusive ownership and unordered samples #5182

MiguelCompany · 2024-08-30T09:21:42Z

Description

During interoperability testing, some flakiness on Test_Ownership_3 unveiled that a reader with exclusive ownership and a KEEP_ALL history may return a mix of samples from writers with different strengths.

This PR adds a regression test and fixes the issue by removing inappropriate samples during the take operation.

@Mergifyio backport 2.14.x 2.10.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
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.

Mario-DL

Just a NIT.
Alternatively, we may have chosen to do the check when adding the change to the instance instead of "waiting" for the user to perform a read/take to do the cleanup, but it should be equivalent.

test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp

Mario-DL

LGTM

MiguelCompany · 2024-09-03T07:14:45Z

@Mario-DL I have rebased this one, and also refactored both the test (I added a second one) and the fix (remove when adding).

MiguelCompany · 2024-09-05T08:55:51Z

Note: The failure in MacOS also failed in PR 5181, so it seems unrelated.

Mario-DL

Fine rework overall ! Leaving a question in the code and other one that comes to me.
If I understood correctly, the changes may affect also to a reader with a sufficiently big keep_last history (e.g 20 or 40).
If that's the case, would it be useful to include an analogous test with that history kind just to check ?

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp

Mario-DL · 2024-09-06T10:01:17Z

NIT
We may remove KEEP_ALL from the PR's title

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

MiguelCompany · 2024-09-06T10:52:23Z

@Mario-DL I rebased this one and refactored the tests in commit b886d86

I also changed the title.

test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp

JesusPoderoso

LGTM

MiguelCompany · 2024-09-10T09:23:07Z

@Mergifyio backport 2.14.x 2.10.x

mergify · 2024-09-10T09:23:21Z

backport 2.14.x 2.10.x

✅ Backports have been created

#5215 [21519] Fix issue with exclusive ownership and unordered samples (backport #5182) has been created for branch 2.14.x but encountered conflicts
#5216 [21519] Fix issue with exclusive ownership and unordered samples (backport #5182) has been created for branch 2.10.x but encountered conflicts

* Refs #20866. Regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Additional regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix issue. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Refactor test to run several cases. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit b1a7fe2) # Conflicts: # test/unittest/dds/subscriber/DataReaderHistoryTests.cpp

* Refs #20866. Regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Additional regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix issue. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Refactor test to run several cases. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit b1a7fe2) Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> # Conflicts: # test/unittest/dds/subscriber/DataReaderHistoryTests.cpp

* Refs #20866. Regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Additional regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix issue. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Fix unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20866. Refactor test to run several cases. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit b1a7fe2) Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> # Conflicts: # test/unittest/dds/subscriber/DataReaderHistoryTests.cpp Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany added this to the v3.0.1 milestone Aug 30, 2024

MiguelCompany force-pushed the bugfix/20866 branch from eafd07d to fbaad04 Compare August 30, 2024 09:23

Mario-DL requested changes Aug 30, 2024

View reviewed changes

test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp Outdated Show resolved Hide resolved

MiguelCompany requested a review from Mario-DL August 30, 2024 11:22

github-actions bot added the ci-pending PR which CI is running label Aug 30, 2024

Mario-DL previously approved these changes Aug 30, 2024

View reviewed changes

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 Sep 2, 2024

MiguelCompany added in progress Issue or PR which is being reviewed and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Sep 2, 2024

MiguelCompany dismissed Mario-DL’s stale review via b13d1de September 3, 2024 07:08

MiguelCompany force-pushed the bugfix/20866 branch 2 times, most recently from b13d1de to ac54175 Compare September 3, 2024 07:11

MiguelCompany added needs-review PR that is ready to be reviewed and removed in progress Issue or PR which is being reviewed labels Sep 3, 2024

MiguelCompany requested a review from Mario-DL September 3, 2024 07:16

github-actions bot added the ci-pending PR which CI is running label Sep 3, 2024

MiguelCompany requested review from Mario-DL and removed request for Mario-DL September 3, 2024 13:43

JesusPoderoso requested review from Mario-DL and removed request for Mario-DL September 4, 2024 14:03

MiguelCompany removed the request for review from Mario-DL September 4, 2024 14:03

JesusPoderoso requested a review from Mario-DL September 4, 2024 14:03

Mario-DL reviewed Sep 5, 2024

View reviewed changes

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp Show resolved Hide resolved

MiguelCompany added 3 commits September 6, 2024 12:16

Refs #20866. Regression test.

43f7656

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

Refs #20866. Additional regression test.

7cd8ed4

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

Refs #20866. Fix issue.

56c4900

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

Refs #20866. Fix unit tests.

3548b2f

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

MiguelCompany force-pushed the bugfix/20866 branch from 21fa2d8 to b66a8c1 Compare September 6, 2024 10:47

MiguelCompany requested a review from Mario-DL September 6, 2024 10:48

Refs #20866. Refactor test to run several cases.

b886d86

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

MiguelCompany force-pushed the bugfix/20866 branch from b66a8c1 to b886d86 Compare September 6, 2024 10:49

MiguelCompany requested review from Mario-DL and removed request for Mario-DL September 6, 2024 10:50

MiguelCompany changed the title ~~[21519] Fix issue with exclusive ownership and KEEP_ALL~~ [21519] Fix issue with exclusive ownership and unordered samples Sep 6, 2024

JesusPoderoso reviewed Sep 10, 2024

View reviewed changes

test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp Show resolved Hide resolved

test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp Show resolved Hide resolved

JesusPoderoso removed needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Sep 10, 2024

JesusPoderoso approved these changes Sep 10, 2024

View reviewed changes

JesusPoderoso added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Sep 10, 2024

MiguelCompany merged commit b1a7fe2 into master Sep 10, 2024
17 checks passed

MiguelCompany deleted the bugfix/20866 branch September 10, 2024 09:22

This was referenced Sep 10, 2024

[21519] Fix issue with exclusive ownership and unordered samples (backport #5182) #5215

Merged

[21519] Fix issue with exclusive ownership and unordered samples (backport #5182) #5216

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[21519] Fix issue with exclusive ownership and unordered samples #5182

[21519] Fix issue with exclusive ownership and unordered samples #5182

MiguelCompany commented Aug 30, 2024 •

edited by JesusPoderoso

Loading

Mario-DL left a comment

Mario-DL left a comment

MiguelCompany commented Sep 3, 2024

MiguelCompany commented Sep 5, 2024

Mario-DL left a comment

Mario-DL commented Sep 6, 2024

MiguelCompany commented Sep 6, 2024

JesusPoderoso left a comment

MiguelCompany commented Sep 10, 2024

mergify bot commented Sep 10, 2024 •

edited

Loading

[21519] Fix issue with exclusive ownership and unordered samples #5182

[21519] Fix issue with exclusive ownership and unordered samples #5182

Conversation

MiguelCompany commented Aug 30, 2024 • edited by JesusPoderoso Loading

Description

Contributor Checklist

Reviewer Checklist

Mario-DL left a comment

Choose a reason for hiding this comment

Mario-DL left a comment

Choose a reason for hiding this comment

MiguelCompany commented Sep 3, 2024

MiguelCompany commented Sep 5, 2024

Mario-DL left a comment

Choose a reason for hiding this comment

Mario-DL commented Sep 6, 2024

MiguelCompany commented Sep 6, 2024

JesusPoderoso left a comment

Choose a reason for hiding this comment

MiguelCompany commented Sep 10, 2024

mergify bot commented Sep 10, 2024 • edited Loading

✅ Backports have been created

MiguelCompany commented Aug 30, 2024 •

edited by JesusPoderoso

Loading

mergify bot commented Sep 10, 2024 •

edited

Loading