Skip to content

Commit a5dd277

Browse files
yuzefovichyuzefovich
committed
backup: use specific issue for disabling test tenant
Release note: None
1 parent f09626f commit a5dd277

File tree

5 files changed

+34
-31
lines changed

5 files changed

+34
-31
lines changed

‎pkg/backup/backup_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ func TestBackupRestorePartitioned(t *testing.T) {
294294
// Disabled to run within tenant as certain MR features are not available to tenants.
295295
args := base.TestClusterArgs{
296296
ServerArgs: base.TestServerArgs{
297-
DefaultTestTenant: base.TODOTestTenantDisabled,
297+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
298298
},
299299
ServerArgsPerNode: map[int]base.TestServerArgs{
300300
0: {
@@ -450,12 +450,14 @@ func TestBackupRestoreExecLocality(t *testing.T) {
450450
defer leaktest.AfterTest(t)()
451451
defer log.Scope(t).Close(t)
452452

453+
skip.UnderRace(t, "too slow")
454+
453455
const numAccounts = 1000
454456

455457
// Disabled to run within tenant as certain MR features are not available to tenants.
456458
args := base.TestClusterArgs{
457459
ServerArgs: base.TestServerArgs{
458-
DefaultTestTenant: base.TODOTestTenantDisabled,
460+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
459461
},
460462
ServerArgsPerNode: map[int]base.TestServerArgs{
461463
0: {
@@ -4078,7 +4080,8 @@ func TestNonLinearChain(t *testing.T) {
40784080
defer cleanup()
40794081

40804082
tc := testcluster.NewTestCluster(t, 1, base.TestClusterArgs{ServerArgs: base.TestServerArgs{
4081-
DefaultTestTenant: base.TODOTestTenantDisabled, ExternalIODir: dir, Knobs: base.TestingKnobs{
4083+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
4084+
ExternalIODir: dir, Knobs: base.TestingKnobs{
40824085
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
40834086
},
40844087
}})
@@ -6502,8 +6505,8 @@ func TestProtectedTimestampsFailDueToLimits(t *testing.T) {
65026505
// The meta table is used to track limits.
65036506
UseMetaTable: true,
65046507
}
6505-
// Test fails within a tenant. Tracked with #76378.
6506-
params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled
6508+
// Test fails within a tenant.
6509+
params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798)
65076510
tc := testcluster.StartTestCluster(t, 1, params)
65086511
defer tc.Stopper().Stop(ctx)
65096512
db := tc.ServerConn(0)
@@ -9273,8 +9276,8 @@ func TestGCDropIndexSpanExpansion(t *testing.T) {
92739276
// This test hangs when run within a tenant. It's likely that
92749277
// the cause of the hang is the fact that we're waiting on the GC to
92759278
// complete, and we don't have visibility into the GC completing from
9276-
// the tenant. More investigation is required. Tracked with #76378.
9277-
DefaultTestTenant: base.TODOTestTenantDisabled,
9279+
// the tenant. More investigation is required.
9280+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
92789281
Knobs: base.TestingKnobs{
92799282
GCJob: &sql.GCJobTestingKnobs{
92809283
RunBeforePerformGC: func(id jobspb.JobID) error {
@@ -9448,7 +9451,7 @@ func TestExcludeDataFromBackupAndRestore(t *testing.T) {
94489451
ServerArgs: base.TestServerArgs{
94499452
// Disabled to run within tenants because the function that sets up the restoring cluster
94509453
// has not been configured yet to run within tenants.
9451-
DefaultTestTenant: base.TODOTestTenantDisabled,
9454+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
94529455
Knobs: base.TestingKnobs{
94539456
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), // speeds up test
94549457
SpanConfig: &spanconfig.TestingKnobs{
@@ -9549,8 +9552,8 @@ func TestExportRequestBelowGCThresholdOnDataExcludedFromBackup(t *testing.T) {
95499552
args := base.TestClusterArgs{
95509553
ServerArgs: base.TestServerArgs{
95519554
// Test fails when run within a tenant as zone config
9552-
// updates are not allowed by default. Tracked with 73768.
9553-
DefaultTestTenant: base.TODOTestTenantDisabled,
9555+
// updates are not allowed by default.
9556+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
95549557
},
95559558
}
95569559
args.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{
@@ -9654,8 +9657,8 @@ func TestExcludeDataFromBackupDoesNotHoldupGC(t *testing.T) {
96549657
params := base.TestClusterArgs{}
96559658
params.ServerArgs.ExternalIODir = dir
96569659
// Test fails when run within a tenant. More investigation is
9657-
// required. Tracked with #76378.
9658-
params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled
9660+
// required.
9661+
params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798)
96599662
params.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{
96609663
DisableGCQueue: true,
96619664
DisableLastProcessedCheck: true,

‎pkg/backup/backuprand/backup_rand_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ func TestBackupRestoreRandomDataRoundtrips(t *testing.T) {
4747
defer nodelocal.ReplaceNodeLocalForTesting(t.TempDir())()
4848
params := base.TestClusterArgs{
4949
ServerArgs: base.TestServerArgs{
50-
// Fails with the default test tenant due to span limits. Tracked
51-
// with #76378.
52-
DefaultTestTenant: base.TODOTestTenantDisabled,
50+
// Fails with the default test tenant due to span limits.
51+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
5352
UseDatabase: "rand",
5453
ExternalIODir: dir,
5554
},

‎pkg/backup/create_scheduled_backup_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ func newTestHelper(t *testing.T, testKnobs ...func(*base.TestingKnobs)) (*testHe
100100
Settings: cluster.MakeClusterSettings(),
101101
ExternalIODir: dir,
102102
// Some scheduled backup tests fail when run within a tenant. More
103-
// investigation is required. Tracked with #76378.
104-
DefaultTestTenant: base.TODOTestTenantDisabled,
103+
// investigation is required.
104+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
105105
Knobs: knobs,
106106
}
107107
jobs.PollJobsMetricsInterval.Override(context.Background(), &args.Settings.SV, 250*time.Millisecond)

‎pkg/backup/datadriven_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ func runTestDataDriven(t *testing.T, testFilePathFromWorkspace string) {
608608
d.ScanArgs(t, "testingKnobCfg", &testingKnobCfg)
609609
}
610610
if d.HasArg("disable-tenant") {
611-
defaultTestTenant = base.TODOTestTenantDisabled
611+
defaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798)
612612
}
613613

614614
// TODO(ssd): Once TestServer starts up reliably enough:

‎pkg/backup/full_cluster_backup_restore_test.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,8 @@ func TestSingletonSpanConfigJobPostRestore(t *testing.T) {
393393
ServerArgs: base.TestServerArgs{
394394
// Disabled only because backupRestoreTestSetupEmpty, another DR test
395395
// helper function, is not yet enabled to set up tenants within
396-
// clusters by default. Tracking issue
397-
// https://github.com/cockroachdb/cockroach/issues/76378
398-
DefaultTestTenant: base.TODOTestTenantDisabled,
396+
// clusters by default.
397+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
399398
Knobs: base.TestingKnobs{
400399
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
401400
},
@@ -1014,9 +1013,8 @@ func TestReintroduceOfflineSpans(t *testing.T) {
10141013
params.ServerArgs.Knobs = knobs
10151014
// Disabled only because backupRestoreTestSetupEmpty, another DR test
10161015
// helper function, is not yet enabled to set up tenants within
1017-
// clusters by default. Tracking issue
1018-
// https://github.com/cockroachdb/cockroach/issues/76378
1019-
params.ServerArgs.DefaultTestTenant = base.TODOTestTenantDisabled
1016+
// clusters by default.
1017+
params.ServerArgs.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798)
10201018

10211019
const numAccounts = 1000
10221020
ctx := context.Background()
@@ -1121,8 +1119,10 @@ func TestRestoreWithRecreatedDefaultDB(t *testing.T) {
11211119
_, sqlDB, tempDir, cleanupFn := backuptestutils.StartBackupRestoreTestCluster(t, singleNode)
11221120
_, sqlDBRestore, cleanupEmptyCluster := backupRestoreTestSetupEmpty(t, singleNode, tempDir, InitManualReplication,
11231121
// Disabling the default test tenant due to test failures. More
1124-
// investigation is required. Tracked with #76378.
1125-
base.TestClusterArgs{ServerArgs: base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDisabled}})
1122+
// investigation is required.
1123+
base.TestClusterArgs{ServerArgs: base.TestServerArgs{
1124+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
1125+
}})
11261126
defer cleanupFn()
11271127
defer cleanupEmptyCluster()
11281128

@@ -1146,8 +1146,10 @@ func TestRestoreWithDroppedDefaultDB(t *testing.T) {
11461146
_, sqlDB, tempDir, cleanupFn := backuptestutils.StartBackupRestoreTestCluster(t, singleNode)
11471147
_, sqlDBRestore, cleanupEmptyCluster := backupRestoreTestSetupEmpty(t, singleNode, tempDir, InitManualReplication,
11481148
// Disabling the default test tenant due to test failures. More
1149-
// investigation is required. Tracked with #76378.
1150-
base.TestClusterArgs{ServerArgs: base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDisabled}})
1149+
// investigation is required.
1150+
base.TestClusterArgs{ServerArgs: base.TestServerArgs{
1151+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
1152+
}})
11511153
defer cleanupFn()
11521154
defer cleanupEmptyCluster()
11531155

@@ -1171,9 +1173,8 @@ func TestFullClusterRestoreWithUserIDs(t *testing.T) {
11711173
ServerArgs: base.TestServerArgs{
11721174
// Disabled only because backupRestoreTestSetupEmpty, another DR test
11731175
// helper function, that is not yet enabled to set up tenants within
1174-
// clusters by default. Tracking issue
1175-
// https://github.com/cockroachdb/cockroach/issues/76378
1176-
DefaultTestTenant: base.TODOTestTenantDisabled,
1176+
// clusters by default.
1177+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798),
11771178
Knobs: base.TestingKnobs{
11781179
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
11791180
},

0 commit comments

Comments
 (0)