From 4741147f75b011dd2940dd6fbd154a0db88e6853 Mon Sep 17 00:00:00 2001 From: Xiang Gu Date: Mon, 7 Aug 2023 10:40:46 -0400 Subject: [PATCH] schemachanger: Skip some reported timeout backup tests --- pkg/sql/schemachanger/sctest/backup.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkg/sql/schemachanger/sctest/backup.go b/pkg/sql/schemachanger/sctest/backup.go index f5357256f004..06a2c13b35da 100644 --- a/pkg/sql/schemachanger/sctest/backup.go +++ b/pkg/sql/schemachanger/sctest/backup.go @@ -35,6 +35,15 @@ import ( "github.com/stretchr/testify/require" ) +// TODO (xiang): Fix and unskip those flaky backup tests. +func skipFlakyBackupTests(t *testing.T, path string) { + if strings.Contains(path, "alter_table_multiple_commands") || + strings.Contains(path, "alter_table_alter_primary_key_drop_rowid") || + strings.Contains(path, "drop_column_basic") { + skip.WithIssue(t, 108221, "skipping flaky tests") + } +} + // BackupSuccess tests that the schema changer can handle being backed up // any time during a successful schema change. func BackupSuccess(t *testing.T, path string, factory TestServerFactory) { @@ -42,6 +51,8 @@ func BackupSuccess(t *testing.T, path string, factory TestServerFactory) { skip.UnderStress(t) skip.UnderRace(t) + skipFlakyBackupTests(t, path) + cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) { backupSuccess(t, factory, cs) }) @@ -57,6 +68,8 @@ func BackupRollbacks(t *testing.T, path string, factory TestServerFactory) { // and at least as expensive to run. skip.UnderShort(t) + skipFlakyBackupTests(t, path) + cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) { backupRollbacks(t, factory, cs) }) @@ -72,6 +85,8 @@ func BackupSuccessMixedVersion(t *testing.T, path string, factory TestServerFact // and at least as expensive to run. skip.UnderShort(t) + skipFlakyBackupTests(t, path) + factory = factory.WithMixedVersion() cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) { backupSuccess(t, factory, cs) @@ -88,6 +103,8 @@ func BackupRollbacksMixedVersion(t *testing.T, path string, factory TestServerFa // and at least as expensive to run. skip.UnderShort(t) + skipFlakyBackupTests(t, path) + factory = factory.WithMixedVersion() cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) { backupRollbacks(t, factory, cs)