Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[21900] Fix DataReaderHistory regression #5327

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[21900] Fix DataReaderHistory regression #5327

merged 2 commits into from
Oct 16, 2024

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Oct 16, 2024 •
edited by Mario-DL
Loading

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

  • 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
    • The ASAN job is showing the regression in the logs, so it is considered enough. I run a manual one here
  • N/A: 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.

@MiguelCompany MiguelCompany added this to the v3.1.1 milestone Oct 16, 2024
@MiguelCompany MiguelCompany changed the title Fix DataReaderHistory regression [21900] Fix DataReaderHistory regression Oct 16, 2024
Mario-DL
Mario-DL previously approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@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.

LGTM

@MiguelCompany
Refs #21694. Fix uncrustify.
682265b 
Signed-off-by: Miguel Company <[email protected]>
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 16, 2024
Mario-DL
Mario-DL approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@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.

LGTM

@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 Oct 16, 2024
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 3.0.x 2.14.x 2.10.x

@MiguelCompany MiguelCompany merged commit 837c6c8 into master Oct 16, 2024
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/21694 branch October 16, 2024 15:02
@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 16, 2024 •
edited
Loading

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
@MiguelCompany @mergify
Fix DataReaderHistory regression (#5327)
547bd1b 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)
@mergify mergify bot mentioned this pull request Oct 16, 2024
Merged
12 tasks
mergify bot pushed a commit that referenced this pull request Oct 16, 2024
@MiguelCompany @mergify
Fix DataReaderHistory regression (#5327)
084d969 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)
mergify bot pushed a commit that referenced this pull request Oct 16, 2024
@MiguelCompany @mergify
Fix DataReaderHistory regression (#5327)
327113a 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)
This was referenced Oct 16, 2024
Merged
Merged
MiguelCompany added a commit that referenced this pull request Oct 17, 2024
@mergify @MiguelCompany
Fix DataReaderHistory regression (#5327) (#5332)
bc0a2d2 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request Oct 17, 2024
@mergify @MiguelCompany
Fix DataReaderHistory regression (#5327) (#5333)
e3b3a02 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request Nov 6, 2024
@mergify @MiguelCompany
Fix DataReaderHistory regression (#5327) (#5331)
f3a38df 
* Refs #21694. Turn assertion into condition.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21694. Fix uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 837c6c8)

Co-authored-by: Miguel Company <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mario-DL Mario-DL Mario-DL approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v3.1.1 - Frozen ❄️
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @Mario-DL