Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-23.1: streamingest: unskip a multi-node c2c test, and skip under deadlock #106785

Closed
wants to merge 1 commit into from
Closed

release-23.1: streamingest: unskip a multi-node c2c test, and skip under deadlock #106785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ func TestTenantStreamingDropTenantCancelsStream(t *testing.T) {
func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.WithIssue(t, 105956)

skip.UnderDeadlock(t, "multi-node may time out under deadlock")
skip.UnderRace(t, "takes too long with multiple nodes")

ctx := context.Background()
Expand Down Expand Up @@ -510,11 +510,6 @@ func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
defer alternateSrcTenantConn.Close()
alternateSrcTenantSQL := sqlutils.MakeSQLRunner(alternateSrcTenantConn)

cleanUpTenant := c.CreateDestTenantSQL(ctx)
defer func() {
require.NoError(t, cleanUpTenant())
}()

alternateCompareResult := func(query string) {
sourceData := alternateSrcTenantSQL.QueryStr(c.T, query)
destData := c.DestTenantSQL.QueryStr(c.T, query)
Expand All @@ -537,6 +532,11 @@ func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
require.Equal(c.T, cutoverTime, cutoverOutput.GoTime())
jobutils.WaitForJobToSucceed(c.T, c.DestSysSQL, jobspb.JobID(ingestionJobID))

cleanUpTenant := c.CreateDestTenantSQL(ctx)
defer func() {
require.NoError(t, cleanUpTenant())
}()

// The destroyed address should have been removed from the topology
progress = jobutils.GetJobProgress(c.T, c.DestSysSQL, jobspb.JobID(ingestionJobID))
newStreamAddresses := progress.GetStreamIngest().StreamAddresses
Expand Down Expand Up @@ -652,6 +652,7 @@ func TestTenantStreamingMultipleNodes(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

skip.UnderDeadlock(t, "multi-node may time out under deadlock")
skip.UnderRace(t, "takes too long with multiple nodes")

ctx := context.Background()
Expand Down