release-24.2: storage: set correct key in WriteTooOld error from pebbleMVCCScanner #131329
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 #131220 on behalf of @nvanbenschoten.
/cc @cockroachdb/release
Noticed while reviewing #131093.
This commit fixes
pebbleMVCCScanner
to set the correct key for themostRecentKey
field when a locking read encounters multiple keys with more recent timestamps. These keys were added toWriteTooOldError
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.