From f989f5888d6470ed68d28a94d3139b422d36cd71 Mon Sep 17 00:00:00 2001 From: Peter Mattis Date: Tue, 28 Aug 2018 18:24:24 -0400 Subject: [PATCH] storage: deflake TestReplicateQueueRebalance Disable the merge queue in this test as it interferes with the splits that are performed manually. Fixes #28563 Release note: None --- pkg/storage/replicate_queue_test.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/storage/replicate_queue_test.go b/pkg/storage/replicate_queue_test.go index 446aecd23d3d..8f07bc4a5df5 100644 --- 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())