server: pass ctx to startTenant

Release note: None
cockroachdb · Jun 2, 2020 · 2825c9d · 2825c9d
1 parent 1e6e1d4
commit 2825c9d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go
@@ -620,6 +620,7 @@ func (ts *TestServer) StartTenant(params base.TestTenantArgs) (pgAddr string, _
 		}
 	}
 	return startTenant(
+		ctx,
 		ts.Stopper(),
 		ts.Cfg.ClusterName,
 		ts.RPCAddr(),
@@ -629,14 +630,14 @@ func (ts *TestServer) StartTenant(params base.TestTenantArgs) (pgAddr string, _
 }
 
 func startTenant(
+	ctx context.Context,
 	stopper *stop.Stopper,
 	kvClusterName string, // NB: gone after https://github.com/cockroachdb/cockroach/issues/42519
 	tsRPCAddr string,
 	baseCfg BaseConfig,
 	sqlCfg SQLConfig,
 ) (pgAddr string, _ error) {
 	args := makeSQLServerArgs(stopper, kvClusterName, baseCfg, sqlCfg)
-	ctx := context.Background()
 	s, err := newSQLServer(ctx, args)
 	if err != nil {
 		return "", err