Skip to content

release-25.4: backfill: skip external tenant under deadlock in vector backfill test #157961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2025
+14 −0
Merged

release-25.4: backfill: skip external tenant under deadlock in vector backfill test #157961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/base/test_server_args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,12 @@ func TestDoesNotWorkWithExternalProcessMode(issueNumber int) DefaultTestTenantOp
return testSkippedForExternalProcessMode(issueNumber)
}

// TestSkipForExternalProcessMode disables selecting the external process
// virtual cluster for tests that are not applicable to that mode.
func TestSkipForExternalProcessMode() DefaultTestTenantOptions {
return testSkippedForExternalProcessMode(0 /* issueNumber */)
}

func testSkippedForExternalProcessMode(issueNumber int) DefaultTestTenantOptions {
return DefaultTestTenantOptions{
testBehavior: ttSharedProcess,
Expand Down
8 changes: 8 additions & 0 deletions pkg/sql/backfill/backfill_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,13 @@ func TestVectorIndexMergingDuringBackfillWithPrefix(t *testing.T) {
blockBackfill := make(chan struct{})
backfillBlocked := make(chan struct{})

var testTenant base.DefaultTestTenantOptions
if syncutil.DeadlockEnabled {
// The cluster can get overloaded under deadlock with external process
// mode.
testTenant = base.TestSkipForExternalProcessMode()
}

ctx := context.Background()
srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
Knobs: base.TestingKnobs{
Expand All @@ -357,6 +364,7 @@ func TestVectorIndexMergingDuringBackfillWithPrefix(t *testing.T) {
},
},
},
DefaultTestTenant: testTenant,
})
defer srv.Stopper().Stop(ctx)
sqlDB := sqlutils.MakeSQLRunner(db)
Expand Down