Merge #53574 #53583 #53670 #53679 #53685 #53688 #53689 #53693 #53695 #…

…53702 #53703 #53704 #53706

53574: sql: fix race in execStmtInOpenState r=solongordon a=solongordon

Fixes #53573

Release justification: low-risk update to new functionality

Release note: None

53583: sql: implement `CREATE SCHEMA ... AUTHORIZATION` r=rohany a=rohany

Fixes #53559.

This commit adds the `CREATE SCHEMA ... AUTHORIZATION` command. When
authorization is provided, the target user is given ownership of the
schema. If the schema name is not provided, then the schema is named the
same name as the target role.

Release justification: low risk updates to new functionality
Release note (sql change): Support the `CREATE SCHEMA ... AUTHORIZATION`
command.

53670: vendor: Bump pebble to e6a9f9a3c936adb8ee8642e4afb2c1ff8dee4562 r=itsbilal a=itsbilal

Changes pulled in:
 - e6a9f9a3c936adb8ee8642e4afb2c1ff8dee4562 compaction: Don't set grandparent limit "behind" keys in fragmenter
 - 04c6a8caf99b691124110f869ef288832cb89356 cmd/pebble: fix rocksdb build errors
 - 4c3a7a171486d287c872cd9bfb38fd811fb0199b internal/manifest: add clone method to iterator
 - 778e980e984175bcb1adb1d09c88a5e04b7762e1 internal/manifest: update FileMetadata refcounts within B-Tree
 - 841f44b62f4bba532d646486928a75c24b66d380 internal/manifest: prohibit overwritten keys in B-Tree
 - 341164583f87cb754452e7c085d22e0119f25c24 *: Add diskHealthChecking{FS,File}, use it to wrap disk writes

Only changes that affect Cockroach are the first and last list items
above.

Release justification: Bugfix change in Pebble, plus a low-risk
change for better visibility into slow disks.

Release note: None.

53679: roachtest: deflake some tests r=irfansharif a=knz

Fixes #53462
Fixes #53520

Release justification: non-production code changes

Release note: None

53685: security: add telemetry for OCSP server checks r=irfansharif a=knz

Fixes  #53473
cc @thtruo 

This commit adds two telemetry counters:

- `server.ocsp.conn-verifications` counts the number of connections
  for which the OCSP feature is enabled

- `server.ocsp.cert-verifications` counts the number of times
  a certificate actually underwent OCSP verification.

Release justification: low risk, high benefit changes to existing functionality

Release note: None

53688: geo/geomfn: implement ST_SymmetricDifference r=otan a=CyrusJavan

Added ST_SymmetricDifference builtin.

ST_SymmetricDifference is simply an alias for ST_SymDifference.

Release justification: low-risk update to new functionality
Release note (sql change): Implemented the geometry based builtin
`ST_SymmetricDifference`.

Resolves: #49052

53689: roachtests: re-enable election-after-restart and kv/gracefuldraining/nodes=3 r=irfansharif a=knz

Fixes #35047
Fixes #33501

**Note that I dislike the idea to run any roachtest under stressrace in the first place.**

Release justification: non-production code changes

Release note: None

53693: roachtest: re-enable acceptance/bank/zerosum-restart r=irfansharif a=knz

Fixes #33683

This test had been flaking earlier in 2019 due to unclean graceful
shutdowns. Since we've heavily reworked that logic since, let's give
the test a second chance.

Release justification: non-production code changes

Release note: None

53695: roachtest: re-enable acceptance/bank/zerosum-splits (revert #34080)  r=irfansharif a=knz

First commit from #53693.

PR #34080 which intended to skip `bank/zerosum-restarts`,
mistakenly skipped `bank/zerosum-splits` instead.
(As `zerosum-restarts` had been skipped already prior)

There was no reason to skip `zerosum-splits`, so this commit
re-enables it.

Release justification: non-production code changes

Release note: None

53702: geos: fix compile error with -Wsign-conversion r=sumeerbhola a=otan

Not sure why this wasn't caught in #53647.

Release justification: bug fixes and low-risk updates to new
functionality

Release note: None

53703: cloud: update orchestrator configs to point to v20.1.5 r=jlinder a=arulajmani

Release justification: changes as part of v20.1.5 release.
Release note: None

53704: sql: update `format_type` to handle user defined types r=rohany a=rohany

Fixes #53684.

Update the `format_type` builtin to handle user defined types.

Release justification: bug fix
Release note: None

53706: roachprod: Build Charybdefs against thrift 0.13 r=itsbilal a=itsbilal

As we use Ubuntu 18.04 on Roachprod clusters, which has
a newer version of bundler and ruby, we have to use a newer
version of Thrift. Using newer Thrift also necessitates some
changes in Charybdefs' build files, so I've forked it, used
the fork here, and submitted the changes upstream:
scylladb/charybdefs#21

Fixes #52533.

Release justification: Roachtest/roachprod only fix.
Release note: None.

Co-authored-by: Solon Gordon <[email protected]>
Co-authored-by: Rohan Yadav <[email protected]>
Co-authored-by: Bilal Akhtar <[email protected]>
Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Cyrus Javan <[email protected]>
Co-authored-by: Oliver Tan <[email protected]>
Co-authored-by: arulajmani <[email protected]>

c-deps/geos-rebuild

@@ -1,4 +1,4 @@
 Bump the version below when changing geos configure flags. Search for "BUILD
 ARTIFACT CACHING" in build/common.mk for rationale.
 
-3
+4

cloud/kubernetes/bring-your-own-certs/client.yaml

@@ -19,7 +19,7 @@ spec:
   serviceAccountName: cockroachdb
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v20.1.4
+    image: cockroachdb/cockroach:v20.1.5
     # Keep a pod open indefinitely so kubectl exec can be used to get a shell to it
     # and run cockroach client commands, such as cockroach sql, cockroach node status, etc.
     command:

cloud/kubernetes/bring-your-own-certs/cockroachdb-statefulset.yaml

@@ -152,7 +152,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

cloud/kubernetes/client-secure.yaml

@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v20.1.4
+    image: cockroachdb/cockroach:v20.1.5
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

cloud/kubernetes/cluster-init-secure.yaml

@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

cloud/kubernetes/cluster-init.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

cloud/kubernetes/cockroachdb-statefulset-secure.yaml

@@ -194,7 +194,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the amount of allocatable resources on each of your Kubernetes nodes by running:

cloud/kubernetes/cockroachdb-statefulset.yaml

@@ -97,7 +97,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the amount of allocatable resources on each of your Kubernetes nodes by running:

cloud/kubernetes/multiregion/client-secure.yaml

@@ -8,7 +8,7 @@ spec:
   serviceAccountName: cockroachdb
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v20.1.4
+    image: cockroachdb/cockroach:v20.1.5
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

cloud/kubernetes/multiregion/cluster-init-secure.yaml

@@ -10,7 +10,7 @@ spec:
       serviceAccountName: cockroachdb
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

cloud/kubernetes/multiregion/cockroachdb-statefulset-secure.yaml

@@ -166,7 +166,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

cloud/kubernetes/multiregion/eks/dns-lb-eks.yaml

@@ -16,4 +16,4 @@ spec:
   selector:
     k8s-app: kube-dns
   type: LoadBalancer
-  loadBalancerSourceRanges: ["0.0.0.0/0"]
+  loadBalancerSourceRanges: ["0.0.0.0/0"]

cloud/kubernetes/performance/cockroachdb-daemonset-insecure.yaml

@@ -81,7 +81,7 @@ spec:
       hostNetwork: true
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: If you configured taints to give CockroachDB exclusive access to nodes, feel free
         # to remove the requests and limits sections. If you didn't, you'll need to change these to

cloud/kubernetes/performance/cockroachdb-daemonset-secure.yaml

@@ -197,7 +197,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: If you configured taints to give CockroachDB exclusive access to nodes, feel free
         # to remove the requests and limits sections. If you didn't, you'll need to change these to

cloud/kubernetes/performance/cockroachdb-statefulset-insecure.yaml

@@ -140,7 +140,7 @@ spec:
       - name: cockroachdb
         # NOTE: Always use the most recent version of CockroachDB for the best
         # performance and reliability.
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the amount of allocatable resources on each of your Kubernetes nodes by running:

cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml

@@ -231,7 +231,7 @@ spec:
       - name: cockroachdb
         # NOTE: Always use the most recent version of CockroachDB for the best
         # performance and reliability.
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the amount of allocatable resources on each of your Kubernetes nodes by running:

cloud/kubernetes/v1.6/client-secure.yaml

@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v20.1.4
+    image: cockroachdb/cockroach:v20.1.5
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

cloud/kubernetes/v1.6/cluster-init-secure.yaml

@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

cloud/kubernetes/v1.6/cluster-init.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

cloud/kubernetes/v1.6/cockroachdb-statefulset-secure.yaml

@@ -177,7 +177,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

cloud/kubernetes/v1.6/cockroachdb-statefulset.yaml

@@ -80,7 +80,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

cloud/kubernetes/v1.7/client-secure.yaml

@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v20.1.4
+    image: cockroachdb/cockroach:v20.1.5
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

cloud/kubernetes/v1.7/cluster-init-secure.yaml

@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

cloud/kubernetes/v1.7/cluster-init.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

cloud/kubernetes/v1.7/cockroachdb-statefulset-secure.yaml

@@ -189,7 +189,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

cloud/kubernetes/v1.7/cockroachdb-statefulset.yaml

@@ -92,7 +92,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v20.1.4
+        image: cockroachdb/cockroach:v20.1.5
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

docs/generated/sql/bnf/stmt_block.bnf

@@ -739,7 +739,6 @@ unreserved_keyword ::=
 	| 'AT'
 	| 'ATTRIBUTE'
 	| 'AUTOMATIC'
-	| 'AUTHORIZATION'
 	| 'BACKUP'
 	| 'BACKUPS'
 	| 'BEFORE'
@@ -1215,6 +1214,8 @@ create_index_stmt ::=
 create_schema_stmt ::=
 	'CREATE' 'SCHEMA' schema_name
 	| 'CREATE' 'SCHEMA' 'IF' 'NOT' 'EXISTS' schema_name
+	| 'CREATE' 'SCHEMA' opt_schema_name 'AUTHORIZATION' role_spec
+	| 'CREATE' 'SCHEMA' 'IF' 'NOT' 'EXISTS' opt_schema_name 'AUTHORIZATION' role_spec
 
 create_table_stmt ::=
 	'CREATE' opt_persistence_temp_table 'TABLE' table_name '(' opt_table_elem_list ')' opt_interleave opt_partition_by
@@ -1690,6 +1691,9 @@ opt_partition_by ::=
 	partition_by
 	| 
 
+opt_schema_name ::=
+	opt_name
+
 opt_persistence_temp_table ::=
 	opt_temp
 	| 'LOCAL' 'TEMPORARY'
@@ -2217,7 +2221,8 @@ row_source_extension_stmt ::=
 	| upsert_stmt
 
 type_func_name_no_crdb_extra_keyword ::=
-	'COLLATION'
+	'AUTHORIZATION'
+	| 'COLLATION'
 	| 'CROSS'
 	| 'FULL'
 	| 'INNER'

docs/generated/sql/functions.md

@@ -1643,6 +1643,9 @@ The paths themselves are given in the direction of the first geometry.</p>
 <tr><td><a name="st_symdifference"></a><code>st_symdifference(geometry_a: geometry, geometry_b: geometry) &rarr; geometry</code></td><td><span class="funcdesc"><p>Returns the symmetric difference of both geometries.</p>
 <p>This function utilizes the GEOS module.</p>
 </span></td></tr>
+<tr><td><a name="st_symmetricdifference"></a><code>st_symmetricdifference(geometry_a: geometry, geometry_b: geometry) &rarr; geometry</code></td><td><span class="funcdesc"><p>Returns the symmetric difference of both geometries.</p>
+<p>This function utilizes the GEOS module.</p>
+</span></td></tr>
 <tr><td><a name="st_touches"></a><code>st_touches(geometry_a: geometry, geometry_b: geometry) &rarr; <a href="bool.html">bool</a></code></td><td><span class="funcdesc"><p>Returns true if the only points in common between geometry_a and geometry_b are on the boundary. Note points do not touch other points.</p>
 <p>This function utilizes the GEOS module.</p>
 <p>This function variant will attempt to utilize any available geospatial index.</p>

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.13.0
 	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f
-	github.com/cockroachdb/pebble v0.0.0-20200824180455-875ca32696b6
+	github.com/cockroachdb/pebble v0.0.0-20200831143935-e6a9f9a3c936
 	github.com/cockroachdb/redact v1.0.2
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2

go.sum

@@ -162,8 +162,8 @@ github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249 h1:pZu
 github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/cockroachdb/pebble v0.0.0-20200824180455-875ca32696b6 h1:erL/39EP/sn3v5oEwYHCPcewADqwQhgzXGRbaRilAjc=
-github.com/cockroachdb/pebble v0.0.0-20200824180455-875ca32696b6/go.mod h1:hU7vhtrqonEphNF+xt8/lHdaBprxmV1h8BOGrd9XwmQ=
+github.com/cockroachdb/pebble v0.0.0-20200831143935-e6a9f9a3c936 h1:MaPvrDBbbWMzmI3uuBMKvcpDfZDY/QHx22T1pb9J6YI=
+github.com/cockroachdb/pebble v0.0.0-20200831143935-e6a9f9a3c936/go.mod h1:hU7vhtrqonEphNF+xt8/lHdaBprxmV1h8BOGrd9XwmQ=
 github.com/cockroachdb/redact v0.0.0-20200622112456-cd282804bbd3 h1:2+dpIJzYMSbLi0587YXpi8tOJT52qCOI/1I0UNThc/I=
 github.com/cockroachdb/redact v0.0.0-20200622112456-cd282804bbd3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.0.2 h1:bRktqHBXPqI+9bkOx0ikn9RS09G9k83oAdLx6rXRVTQ=

pkg/cmd/roachprod/install/install.go

@@ -39,7 +39,7 @@ sudo service cassandra stop;
     sudo mkdir -p "${thrift_dir}"
     sudo chmod 777 "${thrift_dir}"
     cd "${thrift_dir}"
-    curl "https://downloads.apache.org/thrift/0.10.0/thrift-0.10.0.tar.gz" | sudo tar xvz --strip-components 1
+    curl "https://downloads.apache.org/thrift/0.13.0/thrift-0.13.0.tar.gz" | sudo tar xvz --strip-components 1
     sudo ./configure --prefix=/usr
     sudo make -j$(nproc)
     sudo make install
@@ -54,7 +54,8 @@ sudo service cassandra stop;
     sudo rm -rf "${charybde_dir}" "${nemesis_path}" /usr/local/bin/charybdefs{,-nemesis}
     sudo mkdir -p "${charybde_dir}"
     sudo chmod 777 "${charybde_dir}"
-    git clone --depth 1 "https://github.com/scylladb/charybdefs.git" "${charybde_dir}"
+    # TODO(bilal): Change URL back to scylladb/charybdefs once https://github.com/scylladb/charybdefs/pull/21 is merged.
+    git clone --depth 1 "https://github.com/itsbilal/charybdefs.git" "${charybde_dir}"
 
     cd "${charybde_dir}"
     thrift -r --gen cpp server.thrift

pkg/cmd/roachtest/acceptance.go

@@ -26,12 +26,8 @@ func registerAcceptance(r *testRegistry) {
 		// Sorted. Please keep it that way.
 		{name: "bank/cluster-recovery", fn: runBankClusterRecovery},
 		{name: "bank/node-restart", fn: runBankNodeRestart},
-		{
-			name: "bank/zerosum-splits", fn: runBankNodeZeroSum,
-			skip: "https://github.com/cockroachdb/cockroach/issues/33683 (runs into " +
-				" various errors during its rebalances, see IsExpectedRelocateError)",
-		},
-		// {"bank/zerosum-restart", runBankZeroSumRestart},
+		{name: "bank/zerosum-splits", fn: runBankNodeZeroSum},
+		{name: "bank/zerosum-restart", fn: runBankZeroSumRestart},
 		{name: "build-info", fn: runBuildInfo},
 		{name: "build-analyze", fn: runBuildAnalyze},
 		{name: "cli/node-status", fn: runCLINodeStatus},

pkg/cmd/roachtest/cli.go

@@ -28,13 +28,8 @@ func runCLINodeStatus(ctx context.Context, t *test, c *cluster) {
 
 	lastWords := func(s string) []string {
 		var result []string
+		s = elideInsecureDeprecationNotice(s)
 		lines := strings.Split(s, "\n")
-		// v20.1 introduces a deprecation notice for --insecure. Skip over it.
-		// TODO(knz): Remove this when --insecure is dropped.
-		// See: https://github.com/cockroachdb/cockroach/issues/53404
-		if len(lines) > 0 && strings.HasPrefix(lines[0], "Flag --insecure has been deprecated") {
-			lines = lines[2:]
-		}
 		for _, line := range lines {
 			words := strings.Fields(line)
 			if n := len(words); n > 0 {

pkg/cmd/roachtest/decommission.go

@@ -902,8 +902,20 @@ func (h *decommTestHelper) recommission(
 	return execCLI(ctx, h.t, h.c, runNode, args...)
 }
 
+func elideInsecureDeprecationNotice(csvStr string) string {
+	// v20.1 introduces a deprecation notice for --insecure. Skip over it.
+	// TODO(knz): Remove this when --insecure is dropped.
+	// See: https://github.com/cockroachdb/cockroach/issues/53404
+	lines := strings.SplitN(csvStr, "\n", 3)
+	if len(lines) > 0 && strings.HasPrefix(lines[0], "Flag --insecure has been deprecated") {
+		csvStr = lines[2]
+	}
+	return csvStr
+}
+
 // getCsvNumCols returns the number of columns in the given csv string.
 func (h *decommTestHelper) getCsvNumCols(csvStr string) (cols int) {
+	csvStr = elideInsecureDeprecationNotice(csvStr)
 	reader := csv.NewReader(strings.NewReader(csvStr))
 	records, err := reader.Read()
 	if err != nil {
@@ -922,6 +934,7 @@ func (h *decommTestHelper) matchCSV(csvStr string, matchColRow [][]string) (err
 		}
 	}()
 
+	csvStr = elideInsecureDeprecationNotice(csvStr)
 	reader := csv.NewReader(strings.NewReader(csvStr))
 	reader.FieldsPerRecord = -1
 	records, err := reader.ReadAll()

pkg/cmd/roachtest/election.go

@@ -14,16 +14,18 @@ import (
 	"context"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 )
 
 func registerElectionAfterRestart(r *testRegistry) {
 	r.Add(testSpec{
 		Name:    "election-after-restart",
 		Owner:   OwnerKV,
-		Skip:    "https://github.com/cockroachdb/cockroach/issues/35047",
 		Cluster: makeClusterSpec(3),
 		Run: func(ctx context.Context, t *test, c *cluster) {
+			skip.UnderRace(t, "race builds make this test exceed its timeout")
+
 			t.Status("starting up")
 			c.Put(ctx, cockroach, "./cockroach")
 			c.Start(ctx, t)