Merge #154396

154396: kv: make TestBoundedStalenessDataDriven work under multi-tenancy r=arulajmani a=arulajmani

This test isn't set up for external-process multi-tenancy, but we can make it work for shared-process multi-tenancy. This patch does that.

References #142800

Release note: None

Co-authored-by: Arul Ajmani <[email protected]>

Author: craig[bot]

pkg/ccl/kvccl/kvfollowerreadsccl/boundedstaleness_test.go

@@ -270,9 +270,6 @@ func TestBoundedStalenessDataDriven(t *testing.T) {
 	ctx := context.Background()
 
 	clusterArgs := base.TestClusterArgs{
-		ServerArgs: base.TestServerArgs{
-			DefaultTestTenant: base.TODOTestTenantDisabled,
-		},
 		ServerArgsPerNode: map[int]base.TestServerArgs{},
 	}
 	const numNodes = 3
@@ -306,6 +303,14 @@ func TestBoundedStalenessDataDriven(t *testing.T) {
 		tc := testcluster.StartTestCluster(t, 3, clusterArgs)
 		defer tc.Stopper().Stop(ctx)
 
+		if tc.DefaultTenantDeploymentMode().IsExternal() {
+			// This test wants to make assertions about local requests (requests to a
+			// local replica) which is a concept that only applies to single-tenant
+			// and shared-process deployment modes. Skip for external-process
+			// multi-tenancy.
+			skip.IgnoreLint(t, "test doesn't apply to external process multi-tenancy")
+		}
+
 		savedTraceStmt := ""
 		datadriven.RunTest(t, path, func(t *testing.T, d *datadriven.TestData) string {
 			// Early exit non-query execution related commands.
@@ -364,6 +369,12 @@ func TestBoundedStalenessDataDriven(t *testing.T) {
 						return err.Error()
 					}
 					return ""
+				case "exec-system-tenant":
+					_, err := tc.SystemLayer(0).SQLConn(t).Exec(d.Input)
+					if err != nil {
+						return err.Error()
+					}
+					return ""
 				case "query":
 					// Always show events.
 					bse.setStmt(traceStmt)

pkg/ccl/kvccl/kvfollowerreadsccl/testdata/boundedstaleness/single_row

@@ -2,7 +2,7 @@
 # -ignore-wait-until-match as well. Check diff output carefully!
 
 # Set a lower closed timestamp target to speed up time to reach follower reads.
-exec
+exec-system-tenant
 SET CLUSTER SETTING kv.closed_timestamp.target_duration = '1s';
 ----
 
@@ -138,7 +138,7 @@ reset-matching-stmt-for-tracing
 
 
 # Set a super high closed bounded staleness target and execute a schema change.
-exec
+exec-system-tenant
 SET CLUSTER SETTING kv.closed_timestamp.target_duration = '1hr';
 ----