Merge #105771 #105919

105771:  sql: increase time buffer for TestCaptureIndexUsageStats r=gtr a=gtr

Note to reviewers: this builds on top of #105755, please only consider the second commit.

Previously, the `pkg/sql/scheduleslogging/TestCaptureIndexUsageStats`
test failed on CI, despire passing locally. This commit increases the
time buffer from 3s to 4s to give a larger tolerance for
non-determinism.

Fixes #102980
Release note: None

105919: roachtest: Delete scbench randomload test r=rafiss a=rimadeodhar

This test has been skipped for a year and based
on the history of the test hasn't been providing
much value. We can delete it now. Random
schema change testing is covered by schemachange/randomload.

Epic: none
Fixes: #56230
Release note: None

Co-authored-by: gtr <[email protected]>
Co-authored-by: rimadeodhar <[email protected]>

pkg/cmd/roachtest/tests/schemachange_random_load.go

@@ -29,13 +29,6 @@ const (
 	txnLogFile = "transactions.ndjson"
 )
 
-type randomLoadBenchSpec struct {
-	Nodes       int
-	Ops         int
-	Concurrency int
-	Tags        map[string]struct{}
-}
-
 func registerSchemaChangeRandomLoad(r registry.Registry) {
 	geoZones := []string{"us-east1-b", "us-west1-b", "europe-west2-b"}
 	if r.MakeClusterSpec(1).Cloud == spec.AWS {
@@ -63,47 +56,6 @@ func registerSchemaChangeRandomLoad(r registry.Registry) {
 			runSchemaChangeRandomLoad(ctx, t, c, maxOps, concurrency)
 		},
 	})
-
-	// Run a few representative scbench specs in CI.
-	registerRandomLoadBenchSpec(r, randomLoadBenchSpec{
-		Nodes:       3,
-		Ops:         2000,
-		Concurrency: 1,
-		Tags:        registry.Tags("aws"),
-	})
-
-	registerRandomLoadBenchSpec(r, randomLoadBenchSpec{
-		Nodes:       3,
-		Ops:         10000,
-		Concurrency: 20,
-	})
-}
-
-func registerRandomLoadBenchSpec(r registry.Registry, b randomLoadBenchSpec) {
-	nameParts := []string{
-		"scbench",
-		"randomload",
-		fmt.Sprintf("nodes=%d", b.Nodes),
-		fmt.Sprintf("ops=%d", b.Ops),
-		fmt.Sprintf("conc=%d", b.Concurrency),
-	}
-	name := strings.Join(nameParts, "/")
-
-	r.Add(registry.TestSpec{
-		Name:       name,
-		Owner:      registry.OwnerSQLFoundations,
-		Benchmark:  true,
-		Cluster:    r.MakeClusterSpec(b.Nodes),
-		NativeLibs: registry.LibGEOS,
-		Skip:       "https://github.com/cockroachdb/cockroach/issues/56230",
-		// This is set while development is still happening on the workload and we
-		// fix (or bypass) minor schema change bugs that are discovered.
-		NonReleaseBlocker: true,
-		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			runSchemaChangeRandomLoad(ctx, t, c, b.Ops, b.Concurrency)
-		},
-		Tags: b.Tags,
-	})
 }
 
 func runSchemaChangeRandomLoad(

pkg/sql/scheduledlogging/captured_index_usage_stats_test.go

@@ -80,7 +80,7 @@ func TestCaptureIndexUsageStats(t *testing.T) {
 	stubLoggingDelay := 0 * time.Second
 
 	// timeBuffer is a short time buffer to account for non-determinism in the logging timings.
-	const timeBuffer = 3 * time.Second
+	const timeBuffer = 4 * time.Second
 
 	settings := cluster.MakeTestingClusterSettings()
 	// Configure capture index usage statistics to be disabled. This is to test