Merge #91226

91226: batcheval: deflake `TestAddSSTableSSTTimestampToRequestTimestampRespectsClosedTS` r=erikgrinaker a=erikgrinaker Flake introduced by #87264. `@tbg` Can you just quickly verify that this flake is expected given your Raft changes? Seems reasonable to me. Resolves #91211. Release note: None Co-authored-by: Erik Grinaker <[email protected]>
cockroachdb · Nov 4, 2022 · 8a36b94 · 8a36b94
2 parents 01cfd27 + 4c79a49
commit 8a36b94
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go
@@ -1711,7 +1711,11 @@ func TestAddSSTableSSTTimestampToRequestTimestampRespectsClosedTS(t *testing.T)
 
 	ctx := context.Background()
 	si, _, db := serverutils.StartServer(t, base.TestServerArgs{
-		Knobs: base.TestingKnobs{},
+		Knobs: base.TestingKnobs{
+			Store: &kvserver.StoreTestingKnobs{
+				DisableCanAckBeforeApplication: true,
+			},
+		},
 	})
 	defer si.Stopper().Stop(ctx)
 	s := si.(*server.TestServer)