Merge #68522 #69064 #69065

68522: spanconfig: introduce the span config manager r=ajwerner,nvanbenschoten,irfansharif a=arulajmani

See individual commits for details. 



69064: kvserver: fix buglet around error injection r=andreimatei a=andreimatei

When TestingProposalFilter returned an error, the defer above it looking
to release quota was not firing because the error was not assigned
properly.

Release note: None

69065: sql/parser: fix outdated docs links r=otan a=rafiss

Release note: None

Co-authored-by: arulajmani <[email protected]>
Co-authored-by: Andrei Matei <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>

.github/CODEOWNERS

@@ -209,6 +209,7 @@
 /pkg/scheduledjobs/          @cockroachdb/bulk-prs
 /pkg/security/               @cockroachdb/server-prs
 /pkg/settings/               @cockroachdb/server-prs
+/pkg/spanconfig/             @cockroachdb/multiregion
 /pkg/startupmigrations/      @cockroachdb/server-prs @cockroachdb/sql-schema
 /pkg/streaming/              @cockroachdb/bulk-prs
 /pkg/testutils/              @cockroachdb/test-eng

docs/generated/settings/settings-for-tenants.txt

@@ -152,4 +152,4 @@ trace.datadog.project	string	CockroachDB	the project under which traces will be
 trace.debug.enable	boolean	false	if set, traces for recent requests can be seen at https://<ui>/debug/requests
 trace.lightstep.token	string		if set, traces go to Lightstep using this token
 trace.zipkin.collector	string		if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.
-version	version	21.1-134	set the active cluster version in the format '<major>.<minor>'
+version	version	21.1-136	set the active cluster version in the format '<major>.<minor>'

docs/generated/settings/settings.html

@@ -156,6 +156,6 @@
 <tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen at https://<ui>/debug/requests</td></tr>
 <tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
 <tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.</td></tr>
-<tr><td><code>version</code></td><td>version</td><td><code>21.1-134</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
+<tr><td><code>version</code></td><td>version</td><td><code>21.1-136</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -182,6 +182,7 @@ ALL_TESTS = [
     "//pkg/server/tracedumper:tracedumper_test",
     "//pkg/server:server_test",
     "//pkg/settings:settings_test",
+    "//pkg/spanconfig/spanconfigmanager:spanconfigmanager_test",
     "//pkg/sql/catalog/catalogkeys:catalogkeys_test",
     "//pkg/sql/catalog/catalogkv:catalogkv_test",
     "//pkg/sql/catalog/catformat:catformat_test",

pkg/base/testing_knobs.go

@@ -40,4 +40,5 @@ type TestingKnobs struct {
 	MigrationManager        ModuleTestingKnobs
 	IndexUsageStatsKnobs    ModuleTestingKnobs
 	SQLStatsKnobs           ModuleTestingKnobs
+	SpanConfig              ModuleTestingKnobs
 }

pkg/cli/testdata/doctor/test_examine_cluster

@@ -3,5 +3,5 @@ debug doctor examine cluster
 debug doctor examine cluster
 Examining 40 descriptors and 41 namespace entries...
   ParentID  50, ParentSchemaID 29: relation "foo" (53): expected matching namespace entry, found none
-Examining 3 jobs...
+Examining 4 jobs...
 ERROR: validation failed

pkg/clusterversion/cockroach_versions.go

@@ -285,6 +285,9 @@ const (
 	// RecordsBasedRegistry replaces the existing monolithic protobuf-based
 	// encryption-at-rest file registry with the new incremental records-based registry.
 	RecordsBasedRegistry
+	// AutoSpanConfigReconciliationJob adds the AutoSpanConfigReconciliationJob
+	// type.
+	AutoSpanConfigReconciliationJob
 
 	// Step (1): Add new versions here.
 )
@@ -473,6 +476,9 @@ var versionsSingleton = keyedVersions{
 	{
 		Key:     RecordsBasedRegistry,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 134},
+	}, {
+		Key:     AutoSpanConfigReconciliationJob,
+		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 136},
 	},
 
 	// Step (2): Add new versions here.

pkg/jobs/BUILD.bazel

@@ -96,6 +96,7 @@ go_test(
         "//pkg/server",
         "//pkg/settings",
         "//pkg/settings/cluster",
+        "//pkg/spanconfig",
         "//pkg/sql",
         "//pkg/sql/catalog",
         "//pkg/sql/catalog/catalogkeys",