From 623574dcddf2034372b72219f6870ff23956e986 Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Mon, 23 Mar 2020 16:13:29 -0400 Subject: [PATCH] kv: don't disable the merge queue needlessly in more tests Follow up to #46383. These tests were disabling the queue to not interfere with its AdminSplits, but since the tests were written, AdminSplit got a TTL. Release note: None Release justification: test only --- pkg/kv/kvclient/kvcoord/dist_sender_server_test.go | 2 -- pkg/kv/kvserver/client_status_test.go | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go b/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go index c9dca605a014..0a4bd7cd5cbc 100644 --- a/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go +++ b/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go @@ -1312,8 +1312,6 @@ func TestPropagateTxnOnError(t *testing.T) { } return nil } - // Don't clobber the test's splits. - storeKnobs.DisableMergeQueue = true s, _, _ := serverutils.StartServer(t, base.TestServerArgs{Knobs: base.TestingKnobs{Store: &storeKnobs}}) diff --git a/pkg/kv/kvserver/client_status_test.go b/pkg/kv/kvserver/client_status_test.go index 5215e6064948..51940611df0f 100644 --- a/pkg/kv/kvserver/client_status_test.go +++ b/pkg/kv/kvserver/client_status_test.go @@ -15,7 +15,6 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" @@ -24,11 +23,7 @@ import ( func TestComputeStatsForKeySpan(t *testing.T) { defer leaktest.AfterTest(t)() - storeCfg := kvserver.TestStoreConfig(nil /* clock */) - storeCfg.TestingKnobs.DisableMergeQueue = true - mtc := &multiTestContext{ - storeConfig: &storeCfg, - } + mtc := &multiTestContext{} defer mtc.Stop() mtc.Start(t, 3)