diff --git a/pkg/ccl/workloadccl/allccl/BUILD.bazel b/pkg/ccl/workloadccl/allccl/BUILD.bazel index 1f38c823f3be..9e1cefbcb301 100644 --- a/pkg/ccl/workloadccl/allccl/BUILD.bazel +++ b/pkg/ccl/workloadccl/allccl/BUILD.bazel @@ -60,7 +60,6 @@ go_test( "//pkg/testutils/skip", "//pkg/testutils/sqlutils", "//pkg/testutils/testcluster", - "//pkg/util", "//pkg/util/bufalloc", "//pkg/util/leaktest", "//pkg/util/log", diff --git a/pkg/ccl/workloadccl/allccl/all_test.go b/pkg/ccl/workloadccl/allccl/all_test.go index 1bf1232d01ab..46e499808260 100644 --- a/pkg/ccl/workloadccl/allccl/all_test.go +++ b/pkg/ccl/workloadccl/allccl/all_test.go @@ -22,7 +22,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" - "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -47,6 +46,13 @@ func TestAllRegisteredImportFixture(t *testing.T) { sqlMemoryPoolSize := int64(1000 << 20) // 1GiB for _, meta := range workload.Registered() { + if meta.Name == `workload_generator` { + // This will take its schema generation data from flags at run time, + // so static checks are not valid. (This is done separately from the + // switch below to avoid calling gen.Tables() which would print an + // error.) + continue + } meta := meta gen := meta.New() hasInitialData := len(gen.Tables()) != 0 @@ -60,15 +66,15 @@ func TestAllRegisteredImportFixture(t *testing.T) { continue } - // This test is big enough that it causes timeout issues under race, so only - // run one workload. Doing any more than this doesn't get us enough to be - // worth the hassle. - if util.RaceEnabled && meta.Name != `bank` { + // This test is big enough that it causes timeout issues under heavy + // configs, so only run one workload. Doing any more than this doesn't + // get us enough to be worth the hassle. + if skip.Duress() && meta.Name != `bank` { continue } switch meta.Name { - case `startrek`, `roachmart`, `interleavedpartitioned`, `ttlbench`: + case `startrek`, `roachmart`, `ttlbench`: // These don't work with IMPORT. continue case `tpch`: @@ -85,9 +91,6 @@ func TestAllRegisteredImportFixture(t *testing.T) { ctx := context.Background() s, db, _ := serverutils.StartServer(t, base.TestServerArgs{ - // The test tenant needs to be disabled for this test until - // we address #75449. - DefaultTestTenant: base.TODOTestTenantDisabled, UseDatabase: "d", SQLMemoryPoolSize: sqlMemoryPoolSize, }) @@ -120,10 +123,10 @@ func TestAllRegisteredSetup(t *testing.T) { continue } - // This test is big enough that it causes timeout issues under race, so only - // run one workload. Doing any more than this doesn't get us enough to be - // worth the hassle. - if util.RaceEnabled && meta.Name != `bank` { + // This test is big enough that it causes timeout issues under heavy + // configs, so only run one workload. Doing any more than this doesn't + // get us enough to be worth the hassle. + if skip.Duress() && meta.Name != `bank` { continue } @@ -138,9 +141,6 @@ func TestAllRegisteredSetup(t *testing.T) { }); err != nil { t.Fatal(err) } - case `interleavedpartitioned`: - // This require a specific node locality setup. - continue case `ttlbench`: continue case `vecann`: @@ -155,15 +155,12 @@ func TestAllRegisteredSetup(t *testing.T) { t.Run(meta.Name, func(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - s, db, _ := serverutils.StartServer(t, base.TestServerArgs{ - // Need to disable the test tenant here until we resolve - // #75449 as this test makes use of import through a fixture. - DefaultTestTenant: base.TODOTestTenantDisabled, - UseDatabase: "d", + srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{ + UseDatabase: "d", }) - defer s.Stopper().Stop(ctx) + defer srv.Stopper().Stop(ctx) sqlutils.MakeSQLRunner(db).Exec(t, `CREATE DATABASE d`) - sqlutils.MakeSQLRunner(db).Exec(t, `SET CLUSTER SETTING kv.range_merge.queue.enabled = false`) + sqlutils.MakeSQLRunner(srv.SystemLayer().SQLConn(t)).Exec(t, `SET CLUSTER SETTING kv.range_merge.queue.enabled = false`) var l workloadsql.InsertsDataLoader if _, err := workloadsql.Setup(ctx, db, gen, l); err != nil {