Skip to content

Commit

Permalink
storage: deflake TestReplicateQueueRebalance
Browse files Browse the repository at this point in the history
Disable the merge queue in this test as it interferes with the splits
that are performed manually.

Fixes #28563

Release note: None
  • Loading branch information
petermattis committed Aug 29, 2018
1 parent 226085d commit f989f58
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/storage/replicate_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ func TestReplicateQueueRebalance(t *testing.T) {

const numNodes = 5
tc := testcluster.StartTestCluster(t, numNodes,
base.TestClusterArgs{ReplicationMode: base.ReplicationAuto},
base.TestClusterArgs{
ReplicationMode: base.ReplicationAuto,
ServerArgs: base.TestServerArgs{
Knobs: base.TestingKnobs{
Store: &storage.StoreTestingKnobs{
// Prevent the merge queue from immediately discarding our splits.
DisableMergeQueue: true,
},
},
},
},
)
defer tc.Stopper().Stop(context.TODO())

Expand Down

0 comments on commit f989f58

Please sign in to comment.