Skip to content

Commit

Permalink
storage: disable merge queue during TestSplitTriggerRaftSnapshotRace
Browse files Browse the repository at this point in the history
It exposes a bug (likely in range merges), cockroachdb#32784.

Release note: None
  • Loading branch information
tbg committed Dec 7, 2018
1 parent 5a1cd21 commit 71e038b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/storage/client_split_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,8 @@ func TestSplitTriggerRaftSnapshotRace(t *testing.T) {
ctx := context.Background()
const numNodes = 3
var args base.TestClusterArgs
// TODO(benesch): remove this while closing #32784.
args.ServerArgs.Knobs.Store = &storage.StoreTestingKnobs{DisableMergeQueue: true}
// NB: the merge queue is enabled for additional "chaos". Note that the test
// uses three nodes and so there is no replica movement, which would other-
// wise tickle Raft snapshots for unrelated reasons.
Expand Down

0 comments on commit 71e038b

Please sign in to comment.