[21519] Fix issue with exclusive ownership and unordered samples (backport #5182) #5215
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
|
Cherry-pick of b1a7fe2 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 |
13 tasks
JesusPoderoso
force-pushed
the
mergify/bp/2.14.x/pr-5182
branch
from
ca71da2
to
a9df106
Compare
JesusPoderoso
previously approved these changes
Sep 10, 2024
JesusPoderoso
force-pushed
the
mergify/bp/2.14.x/pr-5182
branch
from
a9df106
to
a4c4782
Compare
JesusPoderoso
previously approved these changes
Sep 10, 2024
* 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
JesusPoderoso
force-pushed
the
mergify/bp/2.14.x/pr-5182
branch
from
a4c4782
to
33d6fe9
Compare
JesusPoderoso
approved these changes
Sep 10, 2024
|
Windows CI issue unrelated to the PR content. |
JesusPoderoso
added
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
During interoperability testing, some flakiness on Test_Ownership_3 unveiled that a reader with exclusive ownership and a
KEEP_ALLhistory 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.mdfile (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
This is an automatic backport of pull request #5182 done by [Mergify](https://mergify.com).