Merge #95222

95222: server: rename `server.connector.default_tenant` to `server.controller.default_tenant` r=dhartunian a=knz

Fixes #95220
Epic: CRDB-14537


Co-authored-by: Raphael 'kena' Poss <[email protected]>

docs/generated/settings/settings.html

@@ -76,8 +76,8 @@
 <tr><td><div id="setting-server-child-metrics-enabled" class="anchored"><code>server.child_metrics.enabled</code></div></td><td>boolean</td><td><code>false</code></td><td>enables the exporting of child metrics, additional prometheus time series with extra labels</td></tr>
 <tr><td><div id="setting-server-clock-forward-jump-check-enabled" class="anchored"><code>server.clock.forward_jump_check_enabled</code></div></td><td>boolean</td><td><code>false</code></td><td>if enabled, forward clock jumps &gt; max_offset/2 will cause a panic</td></tr>
 <tr><td><div id="setting-server-clock-persist-upper-bound-interval" class="anchored"><code>server.clock.persist_upper_bound_interval</code></div></td><td>duration</td><td><code>0s</code></td><td>the interval between persisting the wall time upper bound of the clock. The clock does not generate a wall time greater than the persisted timestamp and will panic if it sees a wall time greater than this value. When cockroach starts, it waits for the wall time to catch-up till this persisted timestamp. This guarantees monotonic wall time across server restarts. Not setting this or setting a value of 0 disables this feature.</td></tr>
-<tr><td><div id="setting-server-connector-default-tenant" class="anchored"><code>server.connector.default_tenant</code></div></td><td>string</td><td><code>system</code></td><td>name of the tenant to use to serve requests when clients don&#39;t specify a tenant</td></tr>
 <tr><td><div id="setting-server-consistency-check-max-rate" class="anchored"><code>server.consistency_check.max_rate</code></div></td><td>byte size</td><td><code>8.0 MiB</code></td><td>the rate limit (bytes/sec) to use for consistency checks; used in conjunction with server.consistency_check.interval to control the frequency of consistency checks. Note that setting this too high can negatively impact performance.</td></tr>
+<tr><td><div id="setting-server-controller-default-tenant" class="anchored"><code>server.controller.default_tenant</code></div></td><td>string</td><td><code>system</code></td><td>name of the tenant to use to serve requests when clients don&#39;t specify a tenant</td></tr>
 <tr><td><div id="setting-server-eventlog-enabled" class="anchored"><code>server.eventlog.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if set, logged notable events are also stored in the table system.eventlog</td></tr>
 <tr><td><div id="setting-server-eventlog-ttl" class="anchored"><code>server.eventlog.ttl</code></div></td><td>duration</td><td><code>2160h0m0s</code></td><td>if nonzero, entries in system.eventlog older than this duration are periodically purged</td></tr>
 <tr><td><div id="setting-server-host-based-authentication-configuration" class="anchored"><code>server.host_based_authentication.configuration</code></div></td><td>string</td><td><code></code></td><td>host-based authentication configuration to use during connection authentication</td></tr>

pkg/server/server_controller.go

@@ -223,7 +223,7 @@ const TenantSelectCookieName = `tenant`
 // DefaultTenantSelectSettingName is the name of the setting that
 // configures the default tenant to use when a client does not specify
 // a specific tenant.
-var DefaultTenantSelectSettingName = "server.connector.default_tenant"
+var DefaultTenantSelectSettingName = "server.controller.default_tenant"
 
 var defaultTenantSelect = settings.RegisterStringSetting(
 	settings.SystemOnly,