Skip to content

Commit 37bbff7

Browse files
authored
Merge pull request #153978 from msbutler/backport24.3-147548
release-24.3: crosscluster/physical: skip TestAlterTenantAddReader under deadlock
2 parents fa5b985 + 8c74868 commit 37bbff7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pkg/ccl/crosscluster/physical/alter_replication_job_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/cockroachdb/cockroach/pkg/testutils"
2121
"github.com/cockroachdb/cockroach/pkg/testutils/jobutils"
2222
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
23+
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2324
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
2425
"github.com/cockroachdb/cockroach/pkg/util/hlc"
2526
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -116,6 +117,8 @@ func TestAlterTenantAddReader(t *testing.T) {
116117
defer leaktest.AfterTest(t)()
117118
defer log.Scope(t).Close(t)
118119

120+
skip.UnderDeadlock(t, "flakes with deadlock detector")
121+
119122
ctx := context.Background()
120123
args := replicationtestutils.DefaultTenantStreamingClustersArgs
121124

0 commit comments

Comments
 (0)