From 19cf9f6aefb9fe9e625b9febd3a147518e9c9e63 Mon Sep 17 00:00:00 2001 From: Aayush Shah Date: Wed, 6 Jul 2022 12:59:34 -0400 Subject: [PATCH] kvserver: fix merge skew from previous patch This patch fixes a merge skew introduced by #82680 and 82800 Release note: None --- pkg/kv/kvserver/replicate_queue_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go index 4be39b9f5744..c184e70bd48a 100644 --- a/pkg/kv/kvserver/replicate_queue_test.go +++ b/pkg/kv/kvserver/replicate_queue_test.go @@ -643,9 +643,8 @@ func TestReplicateQueueDecommissionPurgatoryError(t *testing.T) { store := tc.GetFirstStoreFromServer(t, 0) repl, err := store.GetReplica(tc.LookupRangeOrFatal(t, scratchKey).RangeID) require.NoError(t, err) - _, processErr, enqueueErr := tc.GetFirstStoreFromServer(t, 0).ManuallyEnqueue( - ctx, "replicate", repl, true, /* skipShouldQueue */ - ) + _, processErr, enqueueErr := tc.GetFirstStoreFromServer(t, 0).Enqueue( + ctx, "replicate", repl, true /* skipShouldQueue */, false /* async */) require.NoError(t, enqueueErr) _, isPurgErr := kvserver.IsPurgatoryError(processErr) if !isPurgErr {