Merge #152702 #152933 #152999 #153043

152702: changefeedccl: increase timeout for test making many tables r=log-head a=aerfrei

This test timed out in CI while trying to create 50000 tables.
After an hour, it created about 40,000. Adding another hour
should be enough time to finish creation and run the 20 minute
workload.

We also saw a test failure where this pts management metric
came in slightly above the threshold of 25ms, so we raise
that to 30ms.

Epic: none
Fixes: #152654
Fixes: #152962
Release note: None

152933: crosscluster: fix error handling in computeRangeStats r=jeffswenson a=jeffswenson

`computeRangeStats` was returning `err` when it should have returned `lazyIterator.Error`. The code calling this is best effort, so returning success is not a critical bug. But it does mean we would miss a warning log.

Release note: none
Epic: none

152999: statusccl: fix TestTenantStatusAPI with sync stats r=dhartunian a=dhartunian

Resolves: #151886
Epic: None

Release note: None

153043: sqlsmith: fix potential panic when creating stats on 0-column table r=rytaft a=rytaft

This commit avoids a panic by adding a check for 0 columns before calling `rand.Intn(len(columns))`.

There is no release note since this is a test-only change.

Release note: None

Co-authored-by: Aerin Freilich <[email protected]>
Co-authored-by: Jeff Swenson <[email protected]>
Co-authored-by: David Hartunian <[email protected]>
Co-authored-by: Rebecca Taft <[email protected]>

Author: 5 people

pkg/ccl/serverccl/statusccl/tenant_status_test.go

@@ -57,7 +57,11 @@ func TestTenantStatusAPI(t *testing.T) {
 	ctx := context.Background()
 
 	var knobs base.TestingKnobs
-	knobs.SQLStatsKnobs = sqlstats.CreateTestingKnobs()
+
+	sqlStatsKnobs := sqlstats.CreateTestingKnobs()
+	sqlStatsKnobs.SynchronousSQLStats = true
+
+	knobs.SQLStatsKnobs = sqlStatsKnobs
 	knobs.SpanConfig = &spanconfig.TestingKnobs{
 		// Some of these subtests expect multiple (uncoalesced) tenant ranges.
 		StoreDisableCoalesceAdjacent: true,

pkg/cmd/roachtest/tests/cdc.go

@@ -1872,7 +1872,7 @@ func runCDCMultiTablePTSBenchmark(
 	ct.verifyMetrics(ctx, ct.verifyMetricsUnderThreshold([]string{
 		"changefeed_stage_pts_manage_latency",
 		"changefeed_stage_pts_create_latency",
-	}, float64(25*time.Millisecond)))
+	}, float64(30*time.Millisecond)))
 
 	t.Status("multi-table PTS benchmark finished")
 }
@@ -2912,12 +2912,13 @@ func registerCDC(r registry.Registry) {
 
 	for _, perTablePTS := range []bool{false, true} {
 		for _, config := range []struct {
-			numTables int
-			numRanges int
+			numTables    int
+			numRanges    int
+			timeoutHours int
 		}{
-			{numTables: 500, numRanges: 10},
-			{numTables: 5000, numRanges: 10},
-			{numTables: 50000, numRanges: 1}, // Splitting tables into ranges slows down test setup at this scale
+			{numTables: 500, numRanges: 10, timeoutHours: 1},
+			{numTables: 5000, numRanges: 10, timeoutHours: 1},
+			{numTables: 50000, numRanges: 1, timeoutHours: 2}, // Splitting tables into ranges slows down test setup at this scale
 		} {
 			r.Add(registry.TestSpec{
 				Name:             fmt.Sprintf("cdc/multi-table-pts-benchmark/per-table-pts=%t/num-tables=%d/num-ranges=%d", perTablePTS, config.numTables, config.numRanges),
@@ -2926,7 +2927,7 @@ func registerCDC(r registry.Registry) {
 				Cluster:          r.MakeClusterSpec(4, spec.CPU(16), spec.WorkloadNode()),
 				CompatibleClouds: registry.AllClouds,
 				Suites:           registry.Suites(registry.Nightly),
-				Timeout:          1 * time.Hour,
+				Timeout:          time.Duration(config.timeoutHours) * time.Hour,
 				Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
 					params := multiTablePTSBenchmarkParams{
 						numTables:   config.numTables,

pkg/crosscluster/producer/range_stats.go

@@ -108,7 +108,7 @@ func computeRangeStats(
 			}
 		}
 		if lazyIterator.Error() != nil {
-			return streampb.StreamEvent_RangeStats{}, err
+			return streampb.StreamEvent_RangeStats{}, lazyIterator.Error()
 		}
 	}
 	return stats, nil

pkg/internal/sqlsmith/relational.go

@@ -1940,7 +1940,9 @@ func makeCreateStats(s *Smither) (tree.Statement, bool) {
 		s.rnd.Shuffle(len(columns), func(i, j int) {
 			columns[i], columns[j] = columns[j], columns[i]
 		})
-		columns = columns[0:s.rnd.Intn(len(columns))]
+		if len(columns) > 0 {
+			columns = columns[0 : s.rnd.Intn(len(columns))+1]
+		}
 	}
 
 	var options tree.CreateStatsOptions