Merge pull request #116413 from cockroachdb/blathers/backport-release…

…-23.2.0-rc-116371
cockroachdb · Dec 15, 2023 · 863c018 · 863c018
2 parents a6f3b95 + d01d4a1
commit 863c018
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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