Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 15 additions & 12 deletions pkg/backup/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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(),
},
}})
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions pkg/backup/backuprand/backup_rand_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/backup/create_scheduled_backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/datadriven_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
27 changes: 14 additions & 13 deletions pkg/backup/full_cluster_backup_restore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()

Expand All @@ -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()

Expand All @@ -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(),
},
Expand Down