Skip to content

Commit 713e6a3

Browse files
committed
bulkmerge: skip tests under race
These are prone to OOM'ing under `race`. Release note: none Epic: none
1 parent e0282d6 commit 713e6a3

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

pkg/sql/bulkmerge/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ go_test(
5454
"//pkg/sql/sem/eval",
5555
"//pkg/sql/sem/tree",
5656
"//pkg/testutils/serverutils",
57+
"//pkg/testutils/skip",
5758
"//pkg/testutils/sqlutils",
5859
"//pkg/testutils/testcluster",
5960
"//pkg/util/leaktest",

pkg/sql/bulkmerge/merge_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/cockroachdb/cockroach/pkg/sql/execinfrapb"
2222
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
2323
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
24+
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2425
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2526
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
2627
"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -132,6 +133,8 @@ func TestDistributedMergeThreeNodes(t *testing.T) {
132133
defer leaktest.AfterTest(t)()
133134
defer log.Scope(t).Close(t)
134135

136+
skip.UnderRace(t)
137+
135138
ctx := context.Background()
136139
instanceCount := 3
137140
taskCount := 100
@@ -147,6 +150,8 @@ func TestDistributedMergeMoreInstancesThanTasks(t *testing.T) {
147150
defer leaktest.AfterTest(t)()
148151
defer log.Scope(t).Close(t)
149152

153+
skip.UnderRace(t)
154+
150155
ctx := context.Background()
151156
instanceCount := 5
152157
taskCount := 2 // Fewer tasks than instances

0 commit comments

Comments
 (0)