Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign uprelease-2.1: storage: avoid merge deadlock when concurrent split wins #31366
Conversation
benesch
requested review from
bdarnell and
tschottdorf
Oct 15, 2018
benesch
requested a review
from cockroachdb/core-prs
as a
code owner
Oct 15, 2018
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
Show comment
Hide comment
|
This change is |
benesch
merged commit 8c8cdce
into
cockroachdb:release-2.1
Oct 15, 2018
benesch
deleted the
benesch:backport2.1-31294
branch
Oct 15, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
benesch commentedOct 15, 2018
Backport 1/1 commits from #31294.
/cc @cockroachdb/release
@bdarnell, in a stroke of luck, the existing conditional put API supports deleting the existing value when you pass nil.
When merging two adjacent ranges P and Q, we need to be careful to
delete Q's range descriptor with a conditional put, or we can deadlock
with a concurrent split. See the comments and test case within for
details. This commit fixes the last issue that is blocking merges from
being turned on by default.
Release note: None