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-24.1: storage: set correct key in WriteTooOld error from pebbleMVCCScanner #131328

Merged
merged 1 commit into from
Oct 14, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 25, 2024

Backport 1/1 commits from #131220 on behalf of @nvanbenschoten.

/cc @cockroachdb/release


Noticed while reviewing #131093.

This commit fixes pebbleMVCCScanner to set the correct key for the mostRecentKey field when a locking read encounters multiple keys with more recent timestamps. These keys were added to WriteTooOldError in 52c6b1b, which had previously only been carrying the maximum conflicting timestamp. They are currently only used for debugging.

Before this fix, we would always return the first conflicting key, even though we correctly returned the maximum conflicting timestamp.

I'm planning to backport this to each release branch to avoid any confusing during debugging odysseys, but could be convinced that doing so is not worth the (minimal) risk.

Epic: None
Release note: None


Release justification: avoids debug confusion.

Noticed while reviewing #131093.

This commit fixes pebbleMVCCScanner to set the correct key for the
mostRecentKey field when a locking read encounters multiple keys with
more recent timestamps. These keys were added to WriteTooOld error in
52c6b1b, which had previously only been carrying the maximum
conflicting timestamp. They are currently only used for debugging.

Before this fix, we would always return the first conflicting key, even
though we correctly returned the maximum conflicting timestamp.

Epic: None
Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner September 25, 2024 02:34
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.1-131220 branch from 71a2dcc to c294f5e Compare September 25, 2024 02:34
@blathers-crl blathers-crl bot requested a review from jbowens September 25, 2024 02:34
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 25, 2024
Copy link
Author

blathers-crl bot commented Sep 25, 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. 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 requested review from itsbilal and tbg September 25, 2024 02:34
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Sep 25, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@nvanbenschoten nvanbenschoten merged commit 578d876 into release-24.1 Oct 14, 2024
19 of 20 checks passed
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-24.1-131220 branch October 14, 2024 15:49
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.

4 participants