Merge #29221

29221: storage: deflake TestReplicateQueueRebalance r=a-robinson a=petermattis Temporarily disable the merge queue in this test. Fixes #28563 Release note: None Co-authored-by: Peter Mattis <[email protected]>
cockroachdb · Aug 29, 2018 · 69dbd8a · 69dbd8a
2 parents 50ff8dc + f989f58
commit 69dbd8a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/pkg/storage/replicate_queue_test.go b/pkg/storage/replicate_queue_test.go
@@ -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())