Merge pull request #158647 from msbutler/blathers/backport-release-24.3-158637

msbutler · web-flow · commit 0cbf86bc1e13 · 2025-12-03T08:17:31.000-05:00
release-24.3: roachtest: send more schema change flakes to foundations
diff --git a/pkg/cmd/roachtest/tests/backup_restore_roundtrip.go b/pkg/cmd/roachtest/tests/backup_restore_roundtrip.go
@@ -49,7 +49,7 @@ func handleSchemaChangeWorkloadError(err error) error {
 	// crash.
 	if err != nil {
 		flattenedErr := errors.FlattenDetails(err)
-		if strings.Contains(flattenedErr, "UNEXPECTED ERROR") || strings.Contains(flattenedErr, "UNEXPECTED COMMIT ERROR") {
+		if strings.Contains(flattenedErr, "workload run error: ***") || strings.Contains(flattenedErr, "UNEXPECTED ERROR") || strings.Contains(flattenedErr, "UNEXPECTED COMMIT ERROR") {
 			return registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "schema change workload failed"))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func handleSchemaChangeWorkloadError(err error) error {`
`49`	`49`	`// crash.`
`50`	`50`	`if err != nil {`
`51`	`51`	`flattenedErr := errors.FlattenDetails(err)`
`52`		`- if strings.Contains(flattenedErr, "UNEXPECTED ERROR") \|\| strings.Contains(flattenedErr, "UNEXPECTED COMMIT ERROR") {`
	`52`	`+ if strings.Contains(flattenedErr, "workload run error: ***") \|\| strings.Contains(flattenedErr, "UNEXPECTED ERROR") \|\| strings.Contains(flattenedErr, "UNEXPECTED COMMIT ERROR") {`
`53`	`53`	`return registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "schema change workload failed"))`
`54`	`54`	`}`
`55`	`55`	`}`