Merge pull request #158359 from msbutler/backport24.3-158289

release-24.3:  roachtest: route more schema change workload flakes to foundations

Author: msbutler

pkg/cmd/roachtest/tests/backup_restore_roundtrip.go

@@ -43,6 +43,19 @@ var (
 	}
 )
 
+func handleSchemaChangeWorkloadError(err error) error {
+	// If the UNEXPECTED ERROR detail appears, the workload likely flaked.
+	// Otherwise, the workload could have failed due to other reasons like a node
+	// crash.
+	if err != nil {
+		flattenedErr := errors.FlattenDetails(err)
+		if strings.Contains(flattenedErr, "UNEXPECTED ERROR") || strings.Contains(flattenedErr, "UNEXPECTED COMMIT ERROR") {
+			return registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "schema change workload failed"))
+		}
+	}
+	return err
+}
+
 const numFullBackups = 3
 
 type roundTripSpecs struct {
@@ -251,18 +264,9 @@ func startBackgroundWorkloads(
 		return nil, err
 	}
 
-	handleChemaChangeError := func(err error) error {
-		// If the UNEXPECTED ERROR detail appears, the workload likely flaked.
-		// Otherwise, the workload could have failed due to other reasons like a node
-		// crash.
-		if err != nil && strings.Contains(errors.FlattenDetails(err), "UNEXPECTED ERROR") {
-			return registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "schema change workload failed"))
-		}
-		return err
-	}
 	err = c.RunE(ctx, option.WithNodes(workloadNode), scInit.String())
 	if err != nil {
-		return nil, handleChemaChangeError(err)
+		return nil, handleSchemaChangeWorkloadError(err)
 	}
 
 	run := func() (func(), error) {
@@ -279,7 +283,7 @@ func startBackgroundWorkloads(
 		})
 		stopSC := workloadWithCancel(m, func(ctx context.Context) error {
 			if err := c.RunE(ctx, option.WithNodes(workloadNode), scRun.String()); err != nil {
-				return handleChemaChangeError(err)
+				return handleSchemaChangeWorkloadError(err)
 			}
 			return nil
 		})