release-23.1: bench: ignore cluster startup and shutdown

pkg/bench/foreachdb.go

@@ -43,6 +43,14 @@ var runSepProcessTenant = flag.Bool("run-sep-process-tenant", false, "run separa
 // BenchmarkFn is a function that runs a benchmark using the given SQLRunner.
 type BenchmarkFn func(b *testing.B, db *sqlutils.SQLRunner)
 
+// timerUtil is a helper method that should be called right before the
+// invocation of BenchmarkFn and the returned function should be deferred.
+func timerUtil(b *testing.B) func() {
+ b.ResetTimer()
+ b.StartTimer()
+ return b.StopTimer
+}
+
 func benchmarkCockroach(b *testing.B, f BenchmarkFn) {
  s, db, _ := serverutils.StartServer(
  b, base.TestServerArgs{
@@ -55,6 +63,7 @@ func benchmarkCockroach(b *testing.B, f BenchmarkFn) {
  b.Fatal(err)
  }
 
+ defer timerUtil(b)()
  f(b, sqlutils.MakeSQLRunner(db))
 }
 
@@ -104,6 +113,7 @@ func benchmarkSharedProcessTenantCockroach(b *testing.B, f BenchmarkFn) {
  _, err = tenantDB.Exec(`CREATE DATABASE bench`)
  require.NoError(b, err)
 
+ defer timerUtil(b)()
  f(b, sqlutils.MakeSQLRunner(tenantDB))
 }
 
@@ -134,6 +144,7 @@ func benchmarkSepProcessTenantCockroach(b *testing.B, f BenchmarkFn) {
  _, err = tenantDB.Exec(`CREATE DATABASE bench`)
  require.NoError(b, err)
 
+ defer timerUtil(b)()
  f(b, sqlutils.MakeSQLRunner(tenantDB))
 }
 
@@ -151,6 +162,7 @@ func benchmarkMultinodeCockroach(b *testing.B, f BenchmarkFn) {
  }
  defer tc.Stopper().Stop(context.TODO())
 
+ defer timerUtil(b)()
  f(b, sqlutils.MakeRoundRobinSQLRunner(tc.Conns[0], tc.Conns[1], tc.Conns[2]))
 }
 
@@ -199,6 +211,7 @@ func benchmarkPostgres(b *testing.B, f BenchmarkFn) {
  r := sqlutils.MakeSQLRunner(db)
  r.Exec(b, `CREATE SCHEMA IF NOT EXISTS bench`)
 
+ defer timerUtil(b)()
  f(b, r)
 }
 
@@ -219,6 +232,7 @@ func benchmarkMySQL(b *testing.B, f BenchmarkFn) {
  r := sqlutils.MakeSQLRunner(db)
  r.Exec(b, `CREATE DATABASE IF NOT EXISTS bench`)
 
+ defer timerUtil(b)()
  f(b, r)
 }