Skip to content

Commit

Permalink
kvserver: fix merge skew from previous patch
Browse files Browse the repository at this point in the history
This patch fixes a merge skew introduced by cockroachdb#82680 and 82800

Release note: None
  • Loading branch information
aayushshah15 committed Jul 6, 2022
1 parent 2ca7454 commit 19cf9f6
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkg/kv/kvserver/replicate_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 19cf9f6

Please sign in to comment.