/cockroach

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: re-enable the merge queue by default #31394

Merged
merged 4 commits into from Oct 15, 2018

Conversation

Reviewers

@cockroachdb/core-prs core-prs

@cockroachdb/sql-rest-prs sql-rest-prs

@cockroachdb/sql-planning-prs sql-planning-prs

@cockroachdb/distsql-prs distsql-prs

@tschottdorf tschottdorf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@benesch @cockroach-teamcity @tschottdorf
@benesch
Member

benesch commented Oct 15, 2018

Backport 4/6 commits from #29583.

/cc @cockroachdb/release

This reverts commit a1cc4c5.

The results from last night's stress run on were extremely promising. All the failures were existing flaky tests. You can see for yourself here:

https://teamcity.cockroachdb.com/viewType.html?buildTypeId=Cockroach_Nightlies_Stress&tab=buildTypeStatusDiv&branch_Cockroach_Nightlies=refs%2Fheads%2Fmerge-default&state=failed
@benesch
testcluster: fully disable the merge queue in manual replication mode 
The merge queue needs to be disabled via cluster setting (and not
testing knob) in order for ALTER TABLE ... SPLIT AT to work.

Release note: None
08c17df

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

@benesch benesch requested review from cockroachdb/core-prs as code owners 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

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 15, 2018

Member

LGTM
Member

tschottdorf commented Oct 15, 2018

LGTM

benesch added some commits Oct 10, 2018

@benesch
storage: deflake TestLogMerges 
This test needs the merge queue disabled.

Fix #31061.

Release note: None
c7c4e2f
@benesch
distsqlplan: deflake TestMixedDirections and TestSpanResolver 
These tests both need the merge queue to be disabled.

Fix #29321.
Fix #31060.

Release note: None
Loading status checks…
083e4b3
@benesch
storage: deflake TestStoreSetRangesMaxBytes 
TestStoreSetRangesMaxBytes creates manual splits (using a horrendously
outdated function, but that's a problem for another day), so it can't
tolerate the merge queue.

Release note: None
46535e8

@RaduBerinde RaduBerinde referenced this pull request Oct 15, 2018

Open

release: v2.1.0-rc.1 #31359

3 of 16 tasks complete

@benesch benesch merged commit 062e5cd into cockroachdb:release-2.1 Oct 15, 2018
2 checks passed

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-29583 branch Oct 15, 2018

benesch added a commit to benesch/cockroach that referenced this pull request Oct 16, 2018

@benesch
storage: actually enable the merge queue 
This got lost in the backport (cockroachdb#31394) due to a merge conflict.

Release note: None
Verified
This commit was signed with a verified signature.
@benesch benesch Nikhil Benesch
GPG key ID: F7386C5DEADABA7F Learn about signing commits
3e69f3a

@benesch benesch referenced this pull request Oct 16, 2018

Merged

storage: actually enable the merge queue #31419

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