Merge cockroachdb#136152 cockroachdb#136169

136152: roachtest: route schema change workload flakes to foundations r=msbutler a=msbutler About once a week or so, some backup-restore roachtest flakes on the schema change workload. This patch routes these flakes directly to foundations. Epic: none Release note: none 136169: crosscluster/physical: skip replicate manual split r=msbutler a=msbutler Informs cockroachdb#135968 We don't use this feature anyway. Release note: none Co-authored-by: Michael Butler <[email protected]>
aadityasondhi · Nov 26, 2024 · e8c843d · e8c843d
3 parents 9cd7793 + 60e6b4b + 8eef843
commit e8c843d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/ccl/crosscluster/physical/replication_stream_e2e_test.go b/pkg/ccl/crosscluster/physical/replication_stream_e2e_test.go
@@ -579,6 +579,8 @@ func TestReplicateManualSplit(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.WithIssue(t, 135968, "flaky test")
+
 	ctx := context.Background()
 	c, cleanup := replicationtestutils.CreateTenantStreamingClusters(ctx, t, replicationtestutils.DefaultTenantStreamingClustersArgs)
 	defer cleanup()

diff --git a/pkg/cmd/roachtest/tests/backup_restore_roundtrip.go b/pkg/cmd/roachtest/tests/backup_restore_roundtrip.go
@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/randutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
+	"github.com/cockroachdb/errors"
 )
 
 var (
@@ -250,7 +251,7 @@ func startBackgroundWorkloads(
 	}
 	err = c.RunE(ctx, option.WithNodes(workloadNode), scInit.String())
 	if err != nil {
-		return nil, err
+		return nil, registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "failed to init schema change workload"))
 	}
 
 	run := func() (func(), error) {
@@ -267,7 +268,10 @@ func startBackgroundWorkloads(
 			return c.RunE(ctx, option.WithNodes(workloadNode), tpccRun.String())
 		})
 		stopSC := workloadWithCancel(m, func(ctx context.Context) error {
-			return c.RunE(ctx, option.WithNodes(workloadNode), scRun.String())
+			if err := c.RunE(ctx, option.WithNodes(workloadNode), scRun.String()); err != nil {
+				return registry.ErrorWithOwner(registry.OwnerSQLFoundations, errors.Wrapf(err, "failed to run schema change workload"))
+			}
+			return nil
 		})
 
 		stopSystemWriter := workloadWithCancel(m, func(ctx context.Context) error {