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.

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 (backport #5327) #5331

Open
wants to merge 1 commit into
base: 3.0.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2024

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.

This is an automatic backport of pull request #5327 done by [Mergify](https://mergify.com).

* 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
12 tasks
@MiguelCompany MiguelCompany added this to the v3.0.2 milestone Oct 16, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant