Skip to content

Commit

Permalink
kv: re-enable merge queue in TestSplitTriggerRaftSnapshotRace
Browse files Browse the repository at this point in the history
The merge queue was disabled in this test by df26cf6 due to the bug
found in cockroachdb#32784. That bug was fixed by cockroachdb#33312, so we can address the
TODO and re-enable merges in the test.

Release note: None
Release justification: test only
  • Loading branch information
nvanbenschoten committed Mar 23, 2020
1 parent 00605e5 commit 0ed1512
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pkg/kv/kvserver/client_split_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,6 @@ func TestSplitTriggerRaftSnapshotRace(t *testing.T) {
ctx := context.Background()
const numNodes = 3
var args base.TestClusterArgs
// TODO(benesch): remove this while closing #32784.
args.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{DisableMergeQueue: true}
// NB: the merge queue is enabled for additional "chaos". Note that the test
// uses three nodes and so there is no replica movement, which would other-
// wise tickle Raft snapshots for unrelated reasons.
Expand Down

0 comments on commit 0ed1512

Please sign in to comment.