Merge #46269

46269: sql: fix metric logging for temporary objects cleaner r=jordanlewis a=otan Was benchmarking temporary tables and found we didn't actually log these metrics properly. There was a bit of plumbing that I missed doing. This has been resolved and verified in this PR. Release justification: bug fixes and low-risk updates to new functionality Release note: None Co-authored-by: Oliver Tan <[email protected]>
cockroachdb · Mar 20, 2020 · 8eff499 · 8eff499
2 parents a22a085 + fc88f4f
commit 8eff499
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -905,6 +905,7 @@ func NewServer(cfg Config, stopper *stop.Stopper) (*Server, error) {
 	s.temporaryObjectCleaner = sql.NewTemporaryObjectCleaner(
 		s.st,
 		s.db,
+		s.registry,
 		s.distSQLServer.ServerConfig.SessionBoundInternalExecutorFactory,
 		s.status,
 		s.node.stores.IsMeta1Leaseholder,

diff --git a/pkg/sql/temporary_schema.go b/pkg/sql/temporary_schema.go
@@ -387,19 +387,22 @@ func (m *temporaryObjectCleanerMetrics) MetricStruct() {}
 func NewTemporaryObjectCleaner(
 	settings *cluster.Settings,
 	db *kv.DB,
+	registry *metric.Registry,
 	makeSessionBoundInternalExecutor sqlutil.SessionBoundInternalExecutorFactory,
 	statusServer serverpb.StatusServer,
 	isMeta1LeaseholderFunc isMeta1LeaseholderFunc,
 	testingKnobs ExecutorTestingKnobs,
 ) *TemporaryObjectCleaner {
+	metrics := makeTemporaryObjectCleanerMetrics()
+	registry.AddMetricStruct(metrics)
 	return &TemporaryObjectCleaner{
 		settings:                         settings,
 		db:                               db,
 		makeSessionBoundInternalExecutor: makeSessionBoundInternalExecutor,
 		statusServer:                     statusServer,
 		isMeta1LeaseholderFunc:           isMeta1LeaseholderFunc,
 		testingKnobs:                     testingKnobs,
-		metrics:                          makeTemporaryObjectCleanerMetrics(),
+		metrics:                          metrics,
 	}
 }