Skip to content

Commit b661394

Browse files
committed
sql: don't start default test tenant in MT admin function tests
These tests themselves start multiple tenants, so there is no need to create a default test tenant (doing that also makes it a bit more confusing because the default tenant as well as the first test tenant share the same TenantID effectively making it two SQL pod config, which is confusing). Starting the default test tenant was enabled recently in c899661 when we enabled the CCL license, and we have seen at least one confusing failure that is possibly related to this. Starting the default test tenant was originally added in cfa4375, but I don't see a good reason for it. Release note: None
1 parent c6310af commit b661394

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pkg/sql/multitenant_admin_function_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func (tc testCase) runTest(
246246
if numNodes == 0 {
247247
numNodes = 1
248248
}
249-
cfg.ServerArgs.DefaultTestTenant = base.TestTenantProbabilistic
249+
cfg.ServerArgs.DefaultTestTenant = base.TestControlsTenantsExplicitly
250250
testCluster := serverutils.StartNewTestCluster(t, numNodes, cfg.TestClusterArgs)
251251
defer testCluster.Stopper().Stop(ctx)
252252

0 commit comments

Comments
 (0)