Skip to content

Commit 095068c

Browse files
authored
Merge pull request #156984 from mw5h/backportrelease-25.4-154868
release-25.4: backfill: skip TestVectorIndexMergingDuringBackfillWithPrefix under race (#156984) Co-Authored-By: Yahor Yuzefovich <yahor@cockroachlabs.com>
2 parents 87d61ec + 59f3ef3 commit 095068c

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

pkg/sql/backfill/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ go_test(
8787
"//pkg/sql/sem/catid",
8888
"//pkg/sql/sem/eval",
8989
"//pkg/testutils/serverutils",
90+
"//pkg/testutils/skip",
9091
"//pkg/testutils/sqlutils",
9192
"//pkg/testutils/testcluster",
9293
"//pkg/util/leaktest",

pkg/sql/backfill/backfill_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/cockroachdb/cockroach/pkg/kv"
1515
"github.com/cockroachdb/cockroach/pkg/sql/execinfra"
1616
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
17+
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
1718
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
1819
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
1920
"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -339,6 +340,8 @@ func TestVectorIndexMergingDuringBackfillWithPrefix(t *testing.T) {
339340
defer leaktest.AfterTest(t)()
340341
defer log.Scope(t).Close(t)
341342

343+
skip.UnderRace(t, "too slow")
344+
342345
// Channel to block the backfill process
343346
blockBackfill := make(chan struct{})
344347
backfillBlocked := make(chan struct{})

0 commit comments

Comments
 (0)