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

release-19.2: c-deps: bump rocksdb for intra-L0+ingest corruption fix #42009

Merged
merged 1 commit into from
Oct 30, 2019

Conversation

ajkr
Copy link
Contributor

@ajkr ajkr commented Oct 29, 2019

Backport 1/1 commits from #42008.

/cc @cockroachdb/release


Picks up cockroachdb/rocksdb#70.

Release note (bug fix): Prevent rare corruption when files are ingested
that do not overlap with the in-memory buffer and compaction has fallen
behind.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajkr
Copy link
Contributor Author

ajkr commented Oct 29, 2019

For 19.2 updating the branch also pulls in cockroachdb/rocksdb#69. While it's not needed, I also prefer not to fork crl-release-6.2.1.

@ajkr ajkr requested a review from petermattis October 29, 2019 21:46
Copy link
Collaborator

@petermattis petermattis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

For 19.2 updating the branch also pulls in cockroachdb/rocksdb#69. While it's not needed, I also prefer not to fork crl-release-6.2.1.

Agreed. That change looks innocuous enough.

Picks up cockroachdb/rocksdb#70.

Release note (bug fix): Prevent rare corruption when files are ingested
that do not overlap with the in-memory buffer and compaction has fallen
behind.
@ajkr
Copy link
Contributor Author

ajkr commented Oct 29, 2019

TFTR.

bors r+

@petermattis
Copy link
Collaborator

No need to bors on the release branch. Merge skew is unlikely. We do need CI to pass.

@ajkr
Copy link
Contributor Author

ajkr commented Oct 30, 2019

I thought the merge button was greyed last time CI succeeded. Let's see.

@ajkr
Copy link
Contributor Author

ajkr commented Oct 30, 2019

CI timed out after running ~14K race tests, which seems much more than are run against other PRs (how is it determined?). I am rerunning but not sure what'll be different.

@ajkr
Copy link
Contributor Author

ajkr commented Oct 30, 2019

I changed the setting for our release branches to not require bors status check to succeed before merging. Not sure if this config change has other implications, but it un-greys the merge button.

@ajkr ajkr merged commit 141b151 into cockroachdb:release-19.2 Oct 30, 2019
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.

None yet

3 participants