diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go index d97aaab59ad5..fe034489c338 100644 --- a/pkg/backup/backup_test.go +++ b/pkg/backup/backup_test.go @@ -294,7 +294,7 @@ func TestBackupRestorePartitioned(t *testing.T) { // Disabled to run within tenant as certain MR features are not available to tenants. args := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), }, ServerArgsPerNode: map[int]base.TestServerArgs{ 0: { @@ -450,12 +450,14 @@ func TestBackupRestoreExecLocality(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderRace(t, "too slow") + const numAccounts = 1000 // Disabled to run within tenant as certain MR features are not available to tenants. args := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), }, ServerArgsPerNode: map[int]base.TestServerArgs{ 0: { @@ -4078,7 +4080,8 @@ func TestNonLinearChain(t *testing.T) { defer cleanup() tc := testcluster.NewTestCluster(t, 1, base.TestClusterArgs{ServerArgs: base.TestServerArgs{ - DefaultTestTenant: base.TODOTestTenantDisabled, ExternalIODir: dir, Knobs: base.TestingKnobs{ + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), + ExternalIODir: dir, Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, }}) @@ -6502,8 +6505,8 @@ func TestProtectedTimestampsFailDueToLimits(t *testing.T) { // The meta table is used to track limits. UseMetaTable: true, } - // Test fails within a tenant. Tracked with #76378. - params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled + // Test fails within a tenant. + params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798) tc := testcluster.StartTestCluster(t, 1, params) defer tc.Stopper().Stop(ctx) db := tc.ServerConn(0) @@ -9273,8 +9276,8 @@ func TestGCDropIndexSpanExpansion(t *testing.T) { // This test hangs when run within a tenant. It's likely that // the cause of the hang is the fact that we're waiting on the GC to // complete, and we don't have visibility into the GC completing from - // the tenant. More investigation is required. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + // the tenant. More investigation is required. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), Knobs: base.TestingKnobs{ GCJob: &sql.GCJobTestingKnobs{ RunBeforePerformGC: func(id jobspb.JobID) error { @@ -9448,7 +9451,7 @@ func TestExcludeDataFromBackupAndRestore(t *testing.T) { ServerArgs: base.TestServerArgs{ // Disabled to run within tenants because the function that sets up the restoring cluster // has not been configured yet to run within tenants. - DefaultTestTenant: base.TODOTestTenantDisabled, + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), // speeds up test SpanConfig: &spanconfig.TestingKnobs{ @@ -9549,8 +9552,8 @@ func TestExportRequestBelowGCThresholdOnDataExcludedFromBackup(t *testing.T) { args := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ // Test fails when run within a tenant as zone config - // updates are not allowed by default. Tracked with 73768. - DefaultTestTenant: base.TODOTestTenantDisabled, + // updates are not allowed by default. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), }, } args.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{ @@ -9654,8 +9657,8 @@ func TestExcludeDataFromBackupDoesNotHoldupGC(t *testing.T) { params := base.TestClusterArgs{} params.ServerArgs.ExternalIODir = dir // Test fails when run within a tenant. More investigation is - // required. Tracked with #76378. - params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled + // required. + params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798) params.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{ DisableGCQueue: true, DisableLastProcessedCheck: true, diff --git a/pkg/backup/backuprand/backup_rand_test.go b/pkg/backup/backuprand/backup_rand_test.go index 100521d32563..c8b41f12218c 100644 --- a/pkg/backup/backuprand/backup_rand_test.go +++ b/pkg/backup/backuprand/backup_rand_test.go @@ -47,9 +47,8 @@ func TestBackupRestoreRandomDataRoundtrips(t *testing.T) { defer nodelocal.ReplaceNodeLocalForTesting(t.TempDir())() params := base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - // Fails with the default test tenant due to span limits. Tracked - // with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + // Fails with the default test tenant due to span limits. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), UseDatabase: "rand", ExternalIODir: dir, }, diff --git a/pkg/backup/create_scheduled_backup_test.go b/pkg/backup/create_scheduled_backup_test.go index fa48631b26b9..ac2f943050d3 100644 --- a/pkg/backup/create_scheduled_backup_test.go +++ b/pkg/backup/create_scheduled_backup_test.go @@ -100,8 +100,8 @@ func newTestHelper(t *testing.T, testKnobs ...func(*base.TestingKnobs)) (*testHe Settings: cluster.MakeClusterSettings(), ExternalIODir: dir, // Some scheduled backup tests fail when run within a tenant. More - // investigation is required. Tracked with #76378. - DefaultTestTenant: base.TODOTestTenantDisabled, + // investigation is required. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), Knobs: knobs, } jobs.PollJobsMetricsInterval.Override(context.Background(), &args.Settings.SV, 250*time.Millisecond) diff --git a/pkg/backup/datadriven_test.go b/pkg/backup/datadriven_test.go index 1b86fcd415e2..6100d2793c2a 100644 --- a/pkg/backup/datadriven_test.go +++ b/pkg/backup/datadriven_test.go @@ -608,7 +608,7 @@ func runTestDataDriven(t *testing.T, testFilePathFromWorkspace string) { d.ScanArgs(t, "testingKnobCfg", &testingKnobCfg) } if d.HasArg("disable-tenant") { - defaultTestTenant = base.TODOTestTenantDisabled + defaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798) } // TODO(ssd): Once TestServer starts up reliably enough: diff --git a/pkg/backup/full_cluster_backup_restore_test.go b/pkg/backup/full_cluster_backup_restore_test.go index 146a89a565c9..0cf1ed87c294 100644 --- a/pkg/backup/full_cluster_backup_restore_test.go +++ b/pkg/backup/full_cluster_backup_restore_test.go @@ -393,9 +393,8 @@ func TestSingletonSpanConfigJobPostRestore(t *testing.T) { ServerArgs: base.TestServerArgs{ // Disabled only because backupRestoreTestSetupEmpty, another DR test // helper function, is not yet enabled to set up tenants within - // clusters by default. Tracking issue - // https://github.com/cockroachdb/cockroach/issues/76378 - DefaultTestTenant: base.TODOTestTenantDisabled, + // clusters by default. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), }, @@ -1014,9 +1013,8 @@ func TestReintroduceOfflineSpans(t *testing.T) { params.ServerArgs.Knobs = knobs // Disabled only because backupRestoreTestSetupEmpty, another DR test // helper function, is not yet enabled to set up tenants within - // clusters by default. Tracking issue - // https://github.com/cockroachdb/cockroach/issues/76378 - params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled + // clusters by default. + params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798) const numAccounts = 1000 ctx := context.Background() @@ -1121,8 +1119,10 @@ func TestRestoreWithRecreatedDefaultDB(t *testing.T) { _, sqlDB, tempDir, cleanupFn := backuptestutils.StartBackupRestoreTestCluster(t, singleNode) _, sqlDBRestore, cleanupEmptyCluster := backupRestoreTestSetupEmpty(t, singleNode, tempDir, InitManualReplication, // Disabling the default test tenant due to test failures. More - // investigation is required. Tracked with #76378. - base.TestClusterArgs{ServerArgs: base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDisabled}}) + // investigation is required. + base.TestClusterArgs{ServerArgs: base.TestServerArgs{ + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), + }}) defer cleanupFn() defer cleanupEmptyCluster() @@ -1146,8 +1146,10 @@ func TestRestoreWithDroppedDefaultDB(t *testing.T) { _, sqlDB, tempDir, cleanupFn := backuptestutils.StartBackupRestoreTestCluster(t, singleNode) _, sqlDBRestore, cleanupEmptyCluster := backupRestoreTestSetupEmpty(t, singleNode, tempDir, InitManualReplication, // Disabling the default test tenant due to test failures. More - // investigation is required. Tracked with #76378. - base.TestClusterArgs{ServerArgs: base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDisabled}}) + // investigation is required. + base.TestClusterArgs{ServerArgs: base.TestServerArgs{ + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), + }}) defer cleanupFn() defer cleanupEmptyCluster() @@ -1171,9 +1173,8 @@ func TestFullClusterRestoreWithUserIDs(t *testing.T) { ServerArgs: base.TestServerArgs{ // Disabled only because backupRestoreTestSetupEmpty, another DR test // helper function, that is not yet enabled to set up tenants within - // clusters by default. Tracking issue - // https://github.com/cockroachdb/cockroach/issues/76378 - DefaultTestTenant: base.TODOTestTenantDisabled, + // clusters by default. + DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798), Knobs: base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), },