Merge #147732 #147851

147732: sql: skip test crdb_internal.scan_storage_internal_keys r=Dedej-Bergin a=Dedej-Bergin

Fixes: #147197
Release note: none

147851: kvnemesis: add TestKVNemesisMultiNode_BufferedWritesNoPipelining r=arulajmani a=stevendanna

This new kvnemesis test is aimed at stressing the lock reliability features more while working around a known bug in those features when used in conjunction with pipelining.

Epic: none
Release note: None

Co-authored-by: Bergin Dedej <[email protected]>
Co-authored-by: Steven Danna <[email protected]>

Author: 3 people

pkg/kv/kvnemesis/kvnemesis_test.go

@@ -361,6 +361,33 @@ func TestKVNemesisMultiNode_BufferedWrites(t *testing.T) {
 	})
 }
 
+// TestKVNemesisMultiNode_BufferedWritesNoPipelining turns on buffered
+// writes and turns off write pipelining. Turning off write pipelining
+// allows us to test the lock reliability features even without a fix
+// for #145458.
+func TestKVNemesisMultiNode_BufferedWritesNoPipelining(t *testing.T) {
+	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
+
+	testKVNemesisImpl(t, kvnemesisTestCfg{
+		numNodes:                     3,
+		numSteps:                     defaultNumSteps,
+		concurrency:                  5,
+		seedOverride:                 0,
+		invalidLeaseAppliedIndexProb: 0.2,
+		injectReproposalErrorProb:    0.2,
+		assertRaftApply:              true,
+		bufferedWriteProb:            0.70,
+		testSettings: func(ctx context.Context, st *cluster.Settings) {
+			kvcoord.BufferedWritesEnabled.Override(ctx, &st.SV, true)
+			kvcoord.PipelinedWritesEnabled.Override(ctx, &st.SV, false)
+			concurrency.UnreplicatedLockReliabilityLeaseTransfer.Override(ctx, &st.SV, true)
+			concurrency.UnreplicatedLockReliabilityMerge.Override(ctx, &st.SV, true)
+			concurrency.UnreplicatedLockReliabilitySplit.Override(ctx, &st.SV, true)
+		},
+	})
+}
+
 func TestKVNemesisMultiNode(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)

pkg/sql/tests/rsg_test.go

@@ -426,6 +426,7 @@ func TestRandomSyntaxFunctions(t *testing.T) {
 					"crdb_internal.request_statement_bundle",
 					"crdb_internal.reset_activity_tables",
 					"crdb_internal.revalidate_unique_constraints_in_all_tables",
+					"crdb_internal.scan_storage_internal_keys",
 					"crdb_internal.validate_ttl_scheduled_jobs",
 					"crdb_internal.fingerprint":
 					// Skipped due to long execution time.