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

release-23.1: storage: CheckSSTConflicts: fix instance of iterator mismatch #99755

Merged
merged 1 commit into from
Mar 28, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 28, 2023

Backport 1/1 commits from #99695 on behalf of @itsbilal.

/cc @cockroachdb/release


Previously, in one case, we'd let the sst iterator advance ahead of the engine iterator, which violates an invariant in this function. This change fixes that case.

Fixes #99566.
Fixes #99010.

Epic: none

Release note: None


Release justification: Bugfix for a high-priority GA blocker.

Previously, in one case, we'd let the sst iterator advance
ahead of the engine iterator, which violates an invariant
in this function. This change fixes that case.

Fixes #99566.
Fixes #99010.

Epic: none

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners March 28, 2023 02:42
@blathers-crl blathers-crl bot requested a review from itsbilal March 28, 2023 02:42
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99695 branch from 741a95f to 2503486 Compare March 28, 2023 02:42
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 28, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 28, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@jbowens jbowens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@itsbilal
Copy link
Member

TFTR!

@itsbilal itsbilal merged commit 71ab986 into release-23.1 Mar 28, 2023
@itsbilal itsbilal deleted the blathers/backport-release-23.1-99695 branch March 28, 2023 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants