ccl/schemachanger: avoid table restore flavors in mixed version

Previously, the schema changer CCL backup / restore tests could timeout
due to complex depth of coverage offered. To address this, this patch
will avoid testing per-table restore flavors for multiregion and mixed
version variants, so that fewer permutations are tested.

Fixes: #160314
Fixes: #160275

Release note: None

Author: fqazi

pkg/sql/schemachanger/sctest/backup.go

@@ -69,7 +69,7 @@ func BackupRollbacks(t *testing.T, path string, factory TestServerFactory) {
 	// cannot be created with schema_locked by default yet.
 	factory = factory.WithSchemaLockDisabled()
 	cumulativeTestForEachPostCommitStage(t, path, factory, nil, func(t *testing.T, cs CumulativeTestCaseSpec) {
-		backupRollbacks(t, factory, cs)
+		backupRollbacks(t, factory, cs, false /*isMixedVersion*/)
 	},
 		nil /* samplingFn */)
 }
@@ -96,6 +96,11 @@ func BackupSuccessMixedVersion(t *testing.T, path string, factory TestServerFact
 	cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, spec CumulativeTestSpec, dbName string) {
 		backupArgs = backupSuccessPrepare(t, factory, spec, dbName)
 	}, func(t *testing.T, cs CumulativeTestCaseSpec) {
+		if backupArgs.isMultiRegion {
+			// Speed up the mixed version multiregion cases by excluding restores of individual
+			// tables in the mixed version state..
+			backupArgs.excludeAllTablesInDatabaseFlavor = true
+		}
 		backupSuccess(t, backupArgs, cs)
 	},
 		nil /* samplingFn */)
@@ -117,7 +122,7 @@ func BackupRollbacksMixedVersion(t *testing.T, path string, factory TestServerFa
 	// disabling schema_locked in a mixed version state yet.
 	factory = factory.WithSchemaLockDisabled()
 	cumulativeTestForEachPostCommitStage(t, path, factory, nil, func(t *testing.T, cs CumulativeTestCaseSpec) {
-		backupRollbacks(t, factory, cs)
+		backupRollbacks(t, factory, cs, true /*isMixedVersion*/)
 	}, nil /* samplingFn */)
 }
 
@@ -171,11 +176,13 @@ type backupInfo struct {
 
 // backupSuccessTestArgs are arguments generated by backupSuccessPrepare
 type backupSuccessTestArgs struct {
-	server  TestServer
-	backups map[backupKey]backupInfo
-	before  [][]string
-	after   [][]string
-	pe      PlanExplainer
+	server                           TestServer
+	backups                          map[backupKey]backupInfo
+	before                           [][]string
+	after                            [][]string
+	pe                               PlanExplainer
+	isMultiRegion                    bool
+	excludeAllTablesInDatabaseFlavor bool
 }
 
 // backupSuccessPrepare setups a server and takes all required backups for
@@ -276,12 +283,11 @@ func backupSuccessPrepare(
 	})
 	// Take all the required backups using the timestamps gathered.
 	numStagesIncluded := 0
-	isMultiRegion := false
-	tdb.QueryRow(t, "SELECT count(*) >1  FROM [SHOW REGIONS]").Scan(&isMultiRegion)
+	tdb.QueryRow(t, "SELECT count(*) >1  FROM [SHOW REGIONS]").Scan(&backupArgs.isMultiRegion)
 	for key := range backupsToTake {
 		// Determine if we have too many backups to test. We will sample
 		// at most 8 stages or 60% stages, whichever is smaller.
-		if shouldSkipBackup(numStagesIncluded, len(backupsToTake), isMultiRegion) {
+		if shouldSkipBackup(numStagesIncluded, len(backupsToTake), backupArgs.isMultiRegion) {
 			backupArgs.backups[key] = backupInfo{}
 			continue
 		}
@@ -329,12 +335,13 @@ func backupSuccess(t *testing.T, args backupSuccessTestArgs, cs CumulativeTestCa
 		skip.IgnoreLintf(t, "no backup for %v", key)
 	}
 	b := backupRestoreOutcome{
-		url:                     info.url,
-		maySucceed:              true,
-		expectedOnSuccess:       args.after,
-		skipComparisonOnSuccess: skipOutputComparison,
-		mayRollback:             false,
-		expectedOnRollback:      args.before,
+		url:                              info.url,
+		maySucceed:                       true,
+		expectedOnSuccess:                args.after,
+		skipComparisonOnSuccess:          skipOutputComparison,
+		mayRollback:                      false,
+		expectedOnRollback:               args.before,
+		excludeAllTablesInDatabaseFlavor: args.excludeAllTablesInDatabaseFlavor,
 	}
 	tdb := sqlutils.MakeSQLRunner(args.server.DB)
 	if info.isPostBackfill {
@@ -362,7 +369,9 @@ func backupSuccess(t *testing.T, args backupSuccessTestArgs, cs CumulativeTestCa
 	exerciseBackupRestore(t, tdb, cs, b, args.pe)
 }
 
-func backupRollbacks(t *testing.T, factory TestServerFactory, cs CumulativeTestCaseSpec) {
+func backupRollbacks(
+	t *testing.T, factory TestServerFactory, cs CumulativeTestCaseSpec, isMixedVersion bool,
+) {
 	if cs.Phase != scop.PostCommitPhase {
 		return
 	}
@@ -443,6 +452,8 @@ func backupRollbacks(t *testing.T, factory TestServerFactory, cs CumulativeTestC
 
 		// Check that it's the same as before the schema change was attempted.
 		require.Equal(t, expected, postRollback, "rolled back schema change should be no-op")
+		isMultiRegion := false
+		tdb.QueryRow(t, "SELECT count(*) >1  FROM [SHOW REGIONS]").Scan(&isMultiRegion)
 
 		// Restore the backups of the database taken mid-rolled-back-schema-change
 		// in various ways, check that they end up in the same state as present.
@@ -451,6 +462,8 @@ func backupRollbacks(t *testing.T, factory TestServerFactory, cs CumulativeTestC
 				url:                url,
 				mayRollback:        true,
 				expectedOnRollback: postRollback,
+				// Speed up mixed version variants by excluding individual table restores.
+				excludeAllTablesInDatabaseFlavor: isMultiRegion && isMixedVersion,
 			}
 			var name string
 			switch i {
@@ -482,6 +495,7 @@ type backupRestoreOutcome struct {
 	maySucceed, mayRollback               bool
 	expectedOnSuccess, expectedOnRollback [][]string
 	skipComparisonOnSuccess               bool
+	excludeAllTablesInDatabaseFlavor      bool
 }
 
 func exerciseBackupRestore(
@@ -538,7 +552,7 @@ func exerciseBackupRestore(
 	}
 
 	// Determine which tables to restore when restoring tables only.
-	{
+	if !b.excludeAllTablesInDatabaseFlavor {
 		var tablesToRestore []string
 	Loop:
 		for _, row := range backupContents {