From d58c6a4921d8e9e2ce552dc1b9277765e337742a Mon Sep 17 00:00:00 2001 From: Aayush Shah Date: Mon, 3 Aug 2020 21:51:28 -0400 Subject: [PATCH] kvserver: enable merges in kvnemesis We had merges disabled because of the bugs tracked in #44878, but those have since been fixed by #46085 and #50265. Release note: None --- pkg/kv/kvnemesis/kvnemesis_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/kv/kvnemesis/kvnemesis_test.go b/pkg/kv/kvnemesis/kvnemesis_test.go index 0df69877e2c5..c5e8993fe933 100644 --- a/pkg/kv/kvnemesis/kvnemesis_test.go +++ b/pkg/kv/kvnemesis/kvnemesis_test.go @@ -68,10 +68,6 @@ func TestKVNemesisMultiNode(t *testing.T) { config := NewDefaultConfig() config.NumNodes, config.NumReplicas = numNodes, 3 - // kvnemesis found a rare bug with closed timestamps when merges happen - // on a multinode cluster. Disable the combo for now to keep the test - // from flaking. See #44878. - config.Ops.Merge = MergeConfig{} rng, _ := randutil.NewPseudoRand() ct := sqlClosedTimestampTargetInterval{sqlDBs: sqlDBs} failures, err := RunNemesis(ctx, rng, ct, config, dbs...)