From d01d4a1f2c96d3e79e3c16868a59b96af9f5c2bc Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Wed, 13 Dec 2023 19:16:44 +0000 Subject: [PATCH] testserver: set defaults on shared-process tenant before starting it This commit makes it so that we grant the default tenant capabilities (which includes overriding some cluster settings) _before_ we start the shared-process tenant server. This makes it more similar to what we do in the external-process mode and should - hopefully - prevent a race between the cluster setting update picked up by the tenant setting watcher and the test relying on the updated cluster setting value. Release note: None --- pkg/server/testserver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go index 3661fc2d7214..f69d4fb36f26 100644 --- a/pkg/server/testserver.go +++ b/pkg/server/testserver.go @@ -1366,6 +1366,10 @@ func (ts *testServer) StartSharedProcessTenant( } } + if err = ts.grantDefaultTenantCapabilities(ctx, tenantID, args.SkipTenantCheck); err != nil { + return nil, nil, err + } + // Also mark it for shared-process execution. err = execSQL( "start-tenant-shared-service", @@ -1408,10 +1412,6 @@ func (ts *testServer) StartSharedProcessTenant( drain: sqlServerWrapper.drainServer, } - if err = ts.grantDefaultTenantCapabilities(ctx, tenantID, args.SkipTenantCheck); err != nil { - return nil, nil, err - } - sqlDB, err := ts.SQLConnE(serverutils.DBName("cluster:" + string(args.TenantName) + "/" + args.UseDatabase)) if err != nil { return nil, nil, err