/cockroach

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-2.1: ccl/storageccl/engineccl: properly handle intents which straddle sstables #31316

Merged
merged 1 commit into from Oct 12, 2018

Conversation

Reviewers

@danhhz danhhz

@cockroachdb/core-prs core-prs

@cockroachdb/sql-bulk-prs sql-bulk-prs

@benesch benesch

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@petermattis @cockroach-teamcity @danhhz
@petermattis
Contributor

petermattis commented Oct 12, 2018

Backport 1/1 commits from #31290.

/cc @cockroachdb/release

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.
@petermattis
ccl/storageccl/engineccl: properly handle intents which straddle ssta… 
…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 #28358

Release note (bug fix): Fix a rare scenario where a backup could
incorrectly include a key for a transaction which was aborted.
Loading status checks…
dbb839a

@petermattis petermattis requested review from danhhz and benesch Oct 12, 2018

@petermattis petermattis requested review from cockroachdb/core-prs as code owners Oct 12, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 12, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 12, 2018

This change is Reviewable
@danhhz

danhhz approved these changes Oct 12, 2018
View changes

@petermattis petermattis merged commit 051be3c into cockroachdb:release-2.1 Oct 12, 2018
2 checks passed

2 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
license/cla Contributor License Agreement is signed.
Details

@petermattis petermattis deleted the petermattis:backport2.1-31290 branch Oct 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment