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: storage: eagerly queue undersize ranges for merging #31352

Merged
merged 1 commit into from Oct 15, 2018

Conversation

Projects
None yet
3 participants
@benesch
Member

benesch commented Oct 15, 2018

Backport 1/1 commits from #30590.

/cc @cockroachdb/release


When processing a write, check if the range has dropped beneath the
minimum size threshold. If it has, check whether the merge queue would
like to process it. This is analogous to our logic for eagerly splitting
oversize ranges.

Fix #29004.

Release note: None

Before (courtesy of @tschottdorf):

After:

image

storage: eagerly queue undersize ranges for merging
When processing a write, check if the range has dropped beneath the
minimum size threshold. If it has, check whether the merge queue would
like to process it. This is analogous to our logic for eagerly splitting
oversize ranges.

Fix #29004.

Release note: None

@benesch benesch requested a review from tschottdorf Oct 15, 2018

@benesch benesch requested a review from cockroachdb/core-prs as a code owner Oct 15, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 15, 2018

Member

This change is Reviewable

Member

cockroach-teamcity commented Oct 15, 2018

This change is Reviewable

@tschottdorf

Reviewed 3 of 3 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/storage/replica_proposal.go, line 537 at r1 (raw file):

	rResult.Delta = enginepb.MVCCStatsDelta{}

	if r.store.splitQueue != nil && needsSplitBySize { // the boostrap store has a nil split queue

boostrap here and below (but if you bother changing it, let's do it on master and then backport.. so I don't think you should bother)

@benesch

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/storage/replica_proposal.go, line 537 at r1 (raw file):

Previously, tschottdorf (Tobias Schottdorf) wrote…

boostrap here and below (but if you bother changing it, let's do it on master and then backport.. so I don't think you should bother)

D'oh! Thanks.

@benesch benesch merged commit f0fb532 into cockroachdb:release-2.1 Oct 15, 2018

2 checks passed

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

@benesch benesch deleted the benesch:backport2.1-30590 branch Oct 15, 2018

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