diff --git a/pkg/ccl/streamingccl/replicationtestutils/testutils.go b/pkg/ccl/streamingccl/replicationtestutils/testutils.go index 7dded7399709..7394c5911aa6 100644 --- a/pkg/ccl/streamingccl/replicationtestutils/testutils.go +++ b/pkg/ccl/streamingccl/replicationtestutils/testutils.go @@ -322,9 +322,7 @@ func CreateServerArgs(args TenantStreamingClustersArgs) base.TestServerArgs { } } return base.TestServerArgs{ - // Test fails because it tries to set a cluster setting only accessible - // to system tenants. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, Knobs: base.TestingKnobs{ JobsTestingKnobs: defaultJobsTestingKnobs(), DistSQL: &execinfra.TestingKnobs{ diff --git a/pkg/ccl/streamingccl/streamclient/partitioned_stream_client_test.go b/pkg/ccl/streamingccl/streamclient/partitioned_stream_client_test.go index 8115ce576b2c..d49083499684 100644 --- a/pkg/ccl/streamingccl/streamclient/partitioned_stream_client_test.go +++ b/pkg/ccl/streamingccl/streamclient/partitioned_stream_client_test.go @@ -210,9 +210,7 @@ func TestPartitionedStreamReplicationClient(t *testing.T) { h, cleanup := replicationtestutils.NewReplicationHelper(t, base.TestServerArgs{ - // Need to disable the test tenant until tenant-level restore is - // supported. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, diff --git a/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go b/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go index 83c9dddd1530..bc94a02c084e 100644 --- a/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go +++ b/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go @@ -176,7 +176,7 @@ func TestStreamIngestionJobWithRandomClient(t *testing.T) { ServerArgs: base.TestServerArgs{ // Test hangs with test tenant. More investigation is required. // Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, Knobs: base.TestingKnobs{ TenantTestingKnobs: &sql.TenantTestingKnobs{ // Needed to pin down the ID of the replication target. diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go index 8d09c9b611e4..bc7dda40ef1f 100644 --- a/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go +++ b/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go @@ -346,10 +346,7 @@ func TestCutoverBuiltin(t *testing.T) { args := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - // Disable the test tenant as the test below looks for a - // streaming job assuming that it's within the system tenant. - // Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestIsSpecificToStorageLayerAndNeedsASystemTenant, Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, @@ -553,7 +550,6 @@ func TestCutoverFractionProgressed(t *testing.T) { }, }, }, - DefaultTestTenant: base.TODOTestTenantDisabled, }) defer s.Stopper().Stop(ctx) diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go index 9eea4fbb5afc..621aa553fbf1 100644 --- a/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go +++ b/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go @@ -187,7 +187,13 @@ func TestStreamIngestionProcessor(t *testing.T) { ctx := context.Background() tc := testcluster.StartTestCluster(t, 1 /* nodes */, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDisabled}, + ServerArgs: base.TestServerArgs{ + // Perhaps it would be possible to make this + // run in a secondary tenant, but the test + // would need to be completely rewritten to be + // even further from real-world operation. + DefaultTestTenant: base.TestIsSpecificToStorageLayerAndNeedsASystemTenant, + }, }) defer tc.Stopper().Stop(ctx) db := tc.Server(0).InternalDB().(descs.DB) diff --git a/pkg/ccl/streamingccl/streamproducer/producer_job_test.go b/pkg/ccl/streamingccl/streamproducer/producer_job_test.go index d8ff908ffa26..4a549e275cd5 100644 --- a/pkg/ccl/streamingccl/streamproducer/producer_job_test.go +++ b/pkg/ccl/streamingccl/streamproducer/producer_job_test.go @@ -108,9 +108,7 @@ func TestStreamReplicationProducerJob(t *testing.T) { ctx := context.Background() clusterArgs := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - // Test fails within a test tenant. More investigation - // is required. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestIsSpecificToStorageLayerAndNeedsASystemTenant, Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, diff --git a/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go b/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go index 69c966482b21..2d4ef197fd17 100644 --- a/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go +++ b/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go @@ -239,10 +239,7 @@ func TestReplicationStreamInitialization(t *testing.T) { defer log.Scope(t).Close(t) serverArgs := base.TestServerArgs{ - // This test fails when run from within a test tenant. This is likely - // due to the lack of support for tenant streaming, but more - // investigation is required. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, @@ -347,9 +344,7 @@ func TestStreamPartition(t *testing.T) { defer log.Scope(t).Close(t) h, cleanup := replicationtestutils.NewReplicationHelper(t, base.TestServerArgs{ - // Test fails within a test tenant. More investigation is required. - // Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, }) defer cleanup() testTenantName := roachpb.TenantName("test-tenant") @@ -495,9 +490,7 @@ func TestStreamAddSSTable(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) h, cleanup := replicationtestutils.NewReplicationHelper(t, base.TestServerArgs{ - // Test hangs when run within the default test tenant. Tracked with - // #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, }) defer cleanup() testTenantName := roachpb.TenantName("test-tenant") @@ -587,7 +580,7 @@ func TestCompleteStreamReplication(t *testing.T) { Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, }) defer cleanup() srcTenantID := serverutils.TestTenantID() @@ -655,9 +648,7 @@ func TestStreamDeleteRange(t *testing.T) { skip.UnderStressRace(t, "disabled under stress and race") h, cleanup := replicationtestutils.NewReplicationHelper(t, base.TestServerArgs{ - // Test hangs when run within the default test tenant. Tracked with - // #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestControlsTenantsExplicitly, }) defer cleanup() testTenantName := roachpb.TenantName("test-tenant")