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

storage: reintroduce building SSTs from KV_BATCH snapshot #39689

Merged
merged 3 commits into from
Aug 15, 2019

Conversation

jeffrey-xiao
Copy link
Contributor

The final commit of #38932 was previously reverted to due an underlying bug in RocksDB with ingesting range deletion tombstones with a global seqno. See #39604 for discussion on the bug and cockroachdb/rocksdb#43 for the temporary short-term resolution of the bug.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member

tbg commented Aug 15, 2019

Nit: can you make the commit reintroducing the snapshot logic a revert of my revert? You can get this by dropping your commit and running

git revert 271dab429e82a5248fa6ffc054ca0fb55e468c73 0f82aa5eebc8184c7351fd0d3739a1461db6aebc

I typically leave the "revert" line alone so that it's obvious to readers that you're not checking in new code.

This reverts commit 0f82aa5.

Release note: None
@jeffrey-xiao
Copy link
Contributor Author

TFTRs!

bors r+

craig bot pushed a commit that referenced this pull request Aug 15, 2019
39689: storage: reintroduce building SSTs from KV_BATCH snapshot r=jeffrey-xiao a=jeffrey-xiao

The final commit of #38932 was previously reverted to due an underlying bug in RocksDB with ingesting range deletion tombstones with a global seqno. See #39604 for discussion on the bug and cockroachdb/rocksdb#43 for the temporary short-term resolution of the bug.

Release note: None


Co-authored-by: Jeffrey Xiao <jeffrey.xiao1998@gmail.com>
@craig
Copy link
Contributor

craig bot commented Aug 15, 2019

Build succeeded

@craig craig bot merged commit 86411ba into cockroachdb:master Aug 15, 2019
@jeffrey-xiao jeffrey-xiao deleted the sst-snapshot branch August 15, 2019 17:46
jeffrey-xiao added a commit to jeffrey-xiao/cockroach that referenced this pull request Aug 15, 2019
This reverts commit 9309488, reversing
changes made to 367b2af.

Release note: None
craig bot pushed a commit that referenced this pull request Aug 16, 2019
39695: Revert "storage: reintroduce building SSTs from KV_BATCH snapshot" r=jeffrey-xiao a=jeffrey-xiao

This reverts #39689 due to a Mac only issue with ingestion. #39696 is the tracking issue for the bug.

Release note: None

Co-authored-by: Jeffrey Xiao <jeffrey.xiao1998@gmail.com>
jeffrey-xiao added a commit to jeffrey-xiao/cockroach that referenced this pull request Aug 16, 2019
This reverts commit 467ba10.

Release note: None
nvanbenschoten added a commit to nvanbenschoten/cockroach that referenced this pull request Sep 17, 2019
This reverts commit 324151e.

Release note: None
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants