-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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-24.1: release-24.2: storage: fix comparison of suffixes #129740
Merged
RaduBerinde
merged 1 commit into
release-24.1
from
blathers/backport-release-24.1-129605
Aug 28, 2024
Merged
release-24.1: release-24.2: storage: fix comparison of suffixes #129740
RaduBerinde
merged 1 commit into
release-24.1
from
blathers/backport-release-24.1-129605
Aug 28, 2024
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
This is a partial backport of #128043. Release justification: this fixes an issue hit in a real cluster where a range key is never cleaned up. The EngineComparer has a bug when comparing bare suffixes - we call the normalization function on a slice without the sentinel byte; that function's logic is based on length so it will not function properly. We recently observed that this can cause problems when a RangeKeySet has a suffix with the (now obsolete) synthetic bit set, and the corresponding `RangeKeyUnset` is issued by a newer version and doesn't have the bit set. These suffixes are supposed to equal each other but this is not currently the case. We fix the comparator to account for this case correctly and add a more comprehensive test. On the old code, the updated test failed with: ``` Compare(0000000000000002000000010d, 000000000000000200000001010e) = 1, expected 0 ``` Fixes: None Release note: None
blathers-crl
bot
force-pushed
the
blathers/backport-release-24.1-129605
branch
from
August 27, 2024 18:35
59df7c7
to
ee5bdc2
Compare
blathers-crl
bot
added
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
labels
Aug 27, 2024
Thanks for opening a backport. Please check the backport criteria before merging:
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
Also, please add a brief release justification to the body of your PR to justify this |
blathers-crl
bot
added
the
backport
Label PR's that are backports to older release branches
label
Aug 27, 2024
jbowens
approved these changes
Aug 27, 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.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @nicktrav, @RaduBerinde, and @tbg)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
Label PR's that are backports to older release branches
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
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.
Backport 1/1 commits from #129605 on behalf of @RaduBerinde.
/cc @cockroachdb/release
This is a partial backport of #128043. CC @cockroachdb/release
Release justification: this fixes an issue hit in a real cluster where
a range key is never cleaned up.
The EngineComparer has a bug when comparing bare suffixes - we call
the normalization function on a slice without the sentinel byte; that
function's logic is based on length so it will not function properly.
We recently observed that this can cause problems when a
RangeKeySet has a suffix with the (now obsolete) synthetic bit set,
and the corresponding
RangeKeyUnset
is issued by a newer version anddoesn't have the bit set. These suffixes are supposed to equal each
other but this is not currently the case.
We fix the comparator to account for this case correctly and add a
more comprehensive test. On the old code, the updated test failed
with:
Fixes: #129592
Release note: None
Release justification: