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: CheckSSTConflict fix for nexting over overlapping points #99296

Merged
merged 1 commit into from
Mar 23, 2023

Conversation

blathers-crl[bot]
Copy link

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

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

/cc @cockroachdb/release


Previously, the nexting logic around both iterators being at a range key and not a point key was flawed in that we'd miss ext points that were in between
the current and next sst keys, when we'd next both of them. This change addresses that.

It also addresses other miscellaneous corner cases around stats calculations with overlapping sst/engine range keys and point keys. All these bugs were found with the upcoming CheckSSTConflicts randomized test in #98408.

Epic: none

Release note: None


Release justification: Low risk, high priority bugfix for an import / c2c-replication-related code path

Previously, the nexting logic around both iterators
being at a range key and not a point key was flawed
in that we'd miss ext points that were in between
the current and next sst keys, when we'd next both
of them. This change addresses that.

It also addresses other miscellaneous corner cases around
stats calculations with overlapping sst/engine range keys
and point keys. All these bugs were found with the upcoming
CheckSSTConflicts randomized test in #98408.

Epic: none

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners March 22, 2023 22:02
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99141 branch from 1352ad2 to 7f7578c Compare March 22, 2023 22:02
@blathers-crl blathers-crl bot requested a review from itsbilal March 22, 2023 22:02
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99141 branch from 72b1408 to 768d7ca Compare March 22, 2023 22:02
@blathers-crl blathers-crl bot requested review from jbowens and RaduBerinde March 22, 2023 22:02
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 22, 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 22, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@itsbilal
Copy link
Contributor

TFTR!

@itsbilal itsbilal merged commit aa0b102 into release-23.1 Mar 23, 2023
@itsbilal itsbilal deleted the blathers/backport-release-23.1-99141 branch March 23, 2023 16:03
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