From 8608499be4a68cb8ede0b79ee5ae76701f90b123 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Mon, 11 Dec 2023 11:37:57 -0600 Subject: [PATCH] ccl/logictest: skip CCL `multiregion` tests under `race` For some reason, these specific tests are likelier to OOM under `race`. Epic: CRDB-8308 Release note: None --- .../tests/3node-tenant-multiregion/generated_test.go | 1 + .../tests/multiregion-15node-5region-3azs/generated_test.go | 1 + .../multiregion-3node-3superlongregions/generated_test.go | 1 + .../multiregion-9node-3region-3azs-no-los/generated_test.go | 1 + .../multiregion-9node-3region-3azs-tenant/generated_test.go | 1 + .../multiregion-9node-3region-3azs-vec-off/generated_test.go | 1 + .../tests/multiregion-9node-3region-3azs/generated_test.go | 1 + pkg/cmd/generate-logictest/main.go | 2 ++ pkg/cmd/generate-logictest/templates.go | 3 ++- 9 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go index 325cd4ee290d..b0945fab8dfc 100644 --- a/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go +++ b/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go @@ -85,6 +85,7 @@ func runLogicTest(t *testing.T, file string) { logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(logicTestDir, file)) } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/generated_test.go index 49fa99808619..580e426bcde3 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/generated_test.go index ef561fba7e16..4bc8018a1d4c 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/generated_test.go index a4f575f3f1b0..a7e1a0f5b158 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/generated_test.go index b3d602d7f12a..73b25bdd2689 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/generated_test.go index 366feee839d6..a3b22b74f209 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/generated_test.go b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/generated_test.go index 2a28c2c150f7..5e654adb4866 100644 --- a/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/generated_test.go +++ b/pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/generated_test.go @@ -60,6 +60,7 @@ func TestMain(m *testing.M) { } func runCCLLogicTest(t *testing.T, file string) { + skip.UnderRace(t, "times out and/or OOM's") skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } diff --git a/pkg/cmd/generate-logictest/main.go b/pkg/cmd/generate-logictest/main.go index 984ec4dd38ec..8b64ebf880ed 100644 --- a/pkg/cmd/generate-logictest/main.go +++ b/pkg/cmd/generate-logictest/main.go @@ -32,6 +32,7 @@ type testFileTemplateConfig struct { CockroachGoTestserverTest bool Ccl bool ForceProductionValues bool + IsMultiRegion bool Package, TestRuleName, RelDir string ConfigIdx int TestCount int @@ -174,6 +175,7 @@ func (t *testdir) dump() error { tplCfg.RelDir = t.relPathToParent tplCfg.TestCount = testCount tplCfg.CockroachGoTestserverTest = cfg.UseCockroachGoTestserver + tplCfg.IsMultiRegion = strings.Contains(cfg.Name, "multiregion") // The NumCPU calculation is a guess pulled out of thin air to // allocate the tests which use 3-node clusters 2 vCPUs, and // the ones which use more a bit more. diff --git a/pkg/cmd/generate-logictest/templates.go b/pkg/cmd/generate-logictest/templates.go index 25c299ce700d..26208744f389 100644 --- a/pkg/cmd/generate-logictest/templates.go +++ b/pkg/cmd/generate-logictest/templates.go @@ -60,7 +60,8 @@ func runLogicTest(t *testing.T, file string) { {{- define "runCCLLogicTest" }} {{- if .CclLogicTest -}} func runCCLLogicTest(t *testing.T, file string) { - skip.UnderDeadlock(t, "times out and/or hangs") + {{ if .IsMultiRegion }}skip.UnderRace(t, "times out and/or OOM's") + {{ end }}skip.UnderDeadlock(t, "times out and/or hangs") logictest.RunLogicTest(t, logictest.TestServerArgs{}, configIdx, filepath.Join(cclLogicTestDir, file)) } {{ end }}