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.2.0-rc: Revert "kv: stop encoding or decoding synthetic timestamp bit in/from mvcc keys" #117341

Merged

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jan 4, 2024

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.

@blathers-crl blathers-crl bot requested a review from a team as a code owner January 4, 2024 21:59
@blathers-crl blathers-crl bot requested a review from RaduBerinde January 4, 2024 21:59
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2.0-rc-117324 branch from 95ccfaf to 4ce8df8 Compare January 4, 2024 21:59
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 4, 2024
Copy link
Author

blathers-crl bot commented Jan 4, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jan 4, 2024
Copy link
Author

blathers-crl bot commented Jan 4, 2024

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.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@nvanbenschoten nvanbenschoten changed the title release-23.2.0-rc: release-23.2: Revert "kv: stop encoding or decoding synthetic timestamp bit in/from mvcc keys" release-23.2.0-rc: Revert "kv: stop encoding or decoding synthetic timestamp bit in/from mvcc keys" Jan 4, 2024
Copy link
Contributor

@shralex shralex left a 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: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @pav-kv, @RaduBerinde, and @sumeerbhola)

@nvanbenschoten nvanbenschoten merged commit 9249f2e into release-23.2.0-rc Jan 5, 2024
5 of 6 checks passed
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-23.2.0-rc-117324 branch January 5, 2024 04:06
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants