-
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-23.2.0-rc: Revert "kv: stop encoding or decoding synthetic timestamp bit in/from mvcc keys" #117341
release-23.2.0-rc: Revert "kv: stop encoding or decoding synthetic timestamp bit in/from mvcc keys" #117341
Conversation
95ccfaf
to
4ce8df8
Compare
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 |
Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
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.
Reviewed 6 of 6 files at r1.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @pav-kv, @RaduBerinde, and @sumeerbhola)
Backport 2/2 commits from #117324 on behalf of @nvanbenschoten.
/cc @cockroachdb/release
Fixes #117302.
This commit reverts #105523 for the release-23.2 branch while retaining the two commits on master. In doing so, it resolves the replica inconsistency false-positive described in #117302 between v23.1 and v23.2 binaries.
Master will still need a change like #117304 as part of #101938, but this allows us to avoid spreading the migration to remove synthetic timestamps over two releases (which was not the intention). I'm concerned that there may be other unknown consequences of remaining in this mid-migration state, where we don't encode or decode synthetic timestamps, but where the field is still part of the timestamp proto. Pulling the entire migration forward into v24.1 feels safer.
Release note: None
Release justification: Resolves replica inconsistency false-positive.