Merge #83092 #83140

83092: roachtest: don't count cluster reuse failure as clusterCreateErr r=srosenberg a=srosenberg Roachtest tracks each cluster creation error by posting to github. It also maintains a counter of all seen cluster creation errors, namely 'clusterCreateErr'. Previously, a failed attempt to _reuse_ an existing cluster would increment 'clusterCreateErr'. This inconsistency makes it difficult to correlate the number of posted github issues with the final value of 'clusterCreateErr' in the (roachtest) log. This fix removes the increment upon handling any cluster reuse error. Release note: None 83140: sqlsmith: skip crdb_internal.request_statement_bundle r=yuzefovich a=yuzefovich Fixes: #82972. Fixes: #82973. Fixes: #82974. Fixes: #82975. Fixes: #82976. Release note: None Co-authored-by: Stan Rosenberg <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Jun 22, 2022 · a8f7ed7 · a8f7ed7
3 parents 75cf2bb + 74756e7 + 37da8c2
commit a8f7ed7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/test_runner.go b/pkg/cmd/roachtest/test_runner.go
@@ -536,10 +536,9 @@ func (r *testRunner) runWorker(
 				return nil
 			}()
 			if err != nil {
-				// N.B. handle any error during reuse attempt as clusterCreateErr.
 				shout(ctx, l, stdout, "Unable to reuse cluster: %s due to: %s. Will attempt to create a fresh one",
 					c.Name(), err)
-				atomic.AddInt32(&r.numClusterErrs, 1)
+				// N.B. we do not count reuse attempt error toward clusterCreateErr.
 				// Let's attempt to create a fresh one.
 				testToRun.canReuseCluster = false
 			}

diff --git a/pkg/internal/sqlsmith/schema.go b/pkg/internal/sqlsmith/schema.go
@@ -505,6 +505,7 @@ var functions = func() map[tree.FunctionClass]map[oid.Oid][]function {
 			"crdb_internal.replication_stream_progress",
 			"crdb_internal.complete_replication_stream",
 			"crdb_internal.revalidate_unique_constraint",
+			"crdb_internal.request_statement_bundle",
 		} {
 			skip = skip || strings.Contains(def.Name, substr)
 		}