Skip to content

Commit

Permalink
ccl/logictest: skip CCL multiregion tests under race
Browse files Browse the repository at this point in the history
For some reason, these specific tests are likelier to OOM under
`race`.

Epic: CRDB-8308
Release note: None
  • Loading branch information
rickystewart committed Dec 11, 2023
1 parent 5cf65fb commit 8608499
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 1 deletion.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/cmd/generate-logictest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type testFileTemplateConfig struct {
CockroachGoTestserverTest bool
Ccl bool
ForceProductionValues bool
IsMultiRegion bool
Package, TestRuleName, RelDir string
ConfigIdx int
TestCount int
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/generate-logictest/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 8608499

Please sign in to comment.