From d34ac1a36c01e7287611ac3ec0295f00392ea41e Mon Sep 17 00:00:00 2001 From: Renato Costa Date: Wed, 14 Dec 2022 11:22:40 -0500 Subject: [PATCH] bench: fix tenant benchmark Fixes argument passed to `crdb_internal.create_tenant` to remove underscore, which is rejected as an invalid name; and also use the `bench` database in `tenantDB`. Relates to #93530. Epic: none Release note: None --- pkg/bench/foreachdb.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/bench/foreachdb.go b/pkg/bench/foreachdb.go index 8fb748055bf8..1cdc1960acca 100644 --- a/pkg/bench/foreachdb.go +++ b/pkg/bench/foreachdb.go @@ -57,18 +57,18 @@ func benchmarkTenantCockroach(b *testing.B, f BenchmarkFn) { ctx := context.Background() s, db, _ := serverutils.StartServer( b, base.TestServerArgs{ - UseDatabase: "bench", DisableDefaultTestTenant: true, }) defer s.Stopper().Stop(ctx) // Create our own test tenant with a known name. - _, err := db.Exec("SELECT crdb_internal.create_tenant(10, 'bench_tenant')") + tenantName := "benchtenant" + _, err := db.Exec("SELECT crdb_internal.create_tenant(10, $1)", tenantName) require.NoError(b, err) // Get a SQL connection to the test tenant. - sqlAddr := s.(*server.TestServer).TestingGetSQLAddrForTenant(ctx, "bench_tenant") - tenantDB := serverutils.OpenDBConn(b, sqlAddr, "defaultdb", false, s.Stopper()) + sqlAddr := s.(*server.TestServer).TestingGetSQLAddrForTenant(ctx, tenantName) + tenantDB := serverutils.OpenDBConn(b, sqlAddr, "bench", false, s.Stopper()) // The benchmarks sometime hit the default span limit, so we increase it. // NOTE(andrei): Benchmarks drop the tables they're creating, so I'm not sure