ccl/storageccl/engineccl: properly handle intents which straddle sstables#31290
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Oct 12, 2018
Merged
Conversation
Member
|
This change is |
Collaborator
Author
|
See #28358. I think this reproduces the scenario described in that bug. No comments yet, but the code is relatively straightforward. Getting this out for review as I'm going to be offline for the rest of the night. |
486db4c to
ff0dc90
Compare
Collaborator
Author
|
Added some comments to the tests and made it detect the success vs failure condition. The test currently fails (as expected), and passes if I disable |
ff0dc90 to
379d9f4
Compare
Collaborator
Author
|
Implemented the suggested fix to |
…bles An intent which straddles an sstable can lead an incremental iterator to incorrectly ignore an sstable. In order to fix this, when an intent straddles an sstable (i.e. the metadata key is the last key in the sstable) we need to include the intent's timestamp in the timestamp bounds. We don't need to do this for interior intents because we'll already be including the intent's timestamp as it is contained in the next key following the intent. Add `TestMVCCIncrementalIteratorIntentStraddlesSStables` which demonstrates the problem. Fixes cockroachdb#28358 Release note (bug fix): Fix a rare scenario where a backup could incorrectly include a key for a transaction which was aborted.
379d9f4 to
33e2ecf
Compare
Collaborator
Author
|
bors r=danhhz |
craig bot
pushed a commit
that referenced
this pull request
Oct 12, 2018
31290: ccl/storageccl/engineccl: properly handle intents which straddle sstables r=danhhz a=petermattis An intent which straddles an sstable can lead an incremental iterator to incorrectly ignore an sstable. In order to fix this, when an intent straddles an sstable (i.e. the metadata key is the last key in the sstable) we need to include the intent's timestamp in the timestamp bounds. We don't need to do this for interior intents because we'll already be including the intent's timestamp as it is contained in the next key following the intent. Add `TestMVCCIncrementalIteratorIntentStraddlesSStables` which demonstrates the problem. Fixes #28358 Release note (bug fix): Fix a rare scenario where a backup could incorrectly include a key for a transaction which was aborted. Co-authored-by: Peter Mattis <petermattis@gmail.com>
Contributor
Build succeeded |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
An intent which straddles an sstable can lead an incremental iterator to
incorrectly ignore an sstable. In order to fix this, when an intent
straddles an sstable (i.e. the metadata key is the last key in the
sstable) we need to include the intent's timestamp in the timestamp
bounds. We don't need to do this for interior intents because we'll
already be including the intent's timestamp as it is contained in the
next key following the intent. Add
TestMVCCIncrementalIteratorIntentStraddlesSStableswhich demonstratesthe problem.
Fixes #28358
Release note (bug fix): Fix a rare scenario where a backup could
incorrectly include a key for a transaction which was aborted.