-
Notifications
You must be signed in to change notification settings - Fork 786
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
[21900] Fix DataReaderHistory regression #5327
Merged
Merged
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
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany
changed the title
Fix DataReaderHistory regression
[21900] Fix DataReaderHistory regression
Oct 16, 2024
Mario-DL
previously approved these changes
Oct 16, 2024
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
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Mario-DL
approved these changes
Oct 16, 2024
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
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
Oct 16, 2024
@Mergifyio backport 3.0.x 2.14.x 2.10.x |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8)
12 tasks
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8)
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8)
This was referenced Oct 16, 2024
MiguelCompany
added a commit
that referenced
this pull request
Oct 17, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany
added a commit
that referenced
this pull request
Oct 17, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany
added a commit
that referenced
this pull request
Nov 6, 2024
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 837c6c8) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
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
PR #5182 introduced a regression that was not detected since we don't have a CI that builds on Debug mode.
The changes on said PR assumed that a change in the owner of an instance when processing an incoming change would only be due to the change coming from a writer with a bigger strength.
But if the change has an Unregister status, the owner would obviously change to a writer different from the incoming change.
This PR converts the assertion on an additional condition to the
if
that decides whether to remove changes from other writers.@Mergifyio backport 3.0.x 2.14.x 2.10.x
Contributor Checklist
versions.md
file (if applicable).Reviewer Checklist