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

c-deps: import another rocksdb patch to avoid IngestExternalFile segfault #16931

Merged
merged 1 commit into from
Jul 7, 2017

Conversation

benesch
Copy link
Contributor

@benesch benesch commented Jul 7, 2017

985b5d7 imported a patch that fixed one IngestExternalFile segfault, but
it appears there is another. Import "Fix TSAN: avoid arena mode with
range deletions" [0], which seems to the trick. This patch has landed on
master but is not in 5.5.1.

[0]: https://github.com/facebook/rocksdb/pull/2399

Fixes #16922.

…ault

985b5d7 imported a patch that fixed one IngestExternalFile segfault, but
it appears there is another.  Import "Fix TSAN: avoid arena mode with
range deletions" [0], which seems to the trick. This patch has landed on
master but is not in 5.5.1.

[0]: facebook/rocksdb#2399

Fixes cockroachdb#16922.
@benesch benesch requested a review from tbg July 7, 2017 17:36
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member

tbg commented Jul 7, 2017

LGTM, thanks!

@benesch benesch merged commit eec63ac into cockroachdb:master Jul 7, 2017
@benesch benesch deleted the rocksdb-segfault-2 branch July 7, 2017 19:16
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.

rocksdb: range deletion tombstones + IngestExternalFile likely still crashes
3 participants