small refactoring

cmd/kava/opendb/metrics.go

@@ -35,37 +35,13 @@ type Metrics struct {
 	BlockCacheAddFailures metrics.Gauge
 }
 
-func (m *Metrics) send(props *properties, stats *stats) {
-	// Keys
-	m.NumberKeysWritten.Set(float64(stats.NumberKeysWritten))
-	m.NumberKeysRead.Set(float64(stats.NumberKeysRead))
-	m.NumberKeysUpdated.Set(float64(stats.NumberKeysUpdated))
-	m.EstimateNumKeys.Set(float64(props.EstimateNumKeys))
-
-	// Files
-	m.NumberFileOpens.Set(float64(stats.NumberFileOpens))
-	m.NumberFileErrors.Set(float64(stats.NumberFileErrors))
-
-	// Memory
-	m.BlockCacheUsage.Set(float64(props.BlockCacheUsage))
-	m.EstimateTableReadersMem.Set(float64(props.EstimateTableReadersMem))
-	m.CurSizeAllMemTables.Set(float64(props.CurSizeAllMemTables))
-	m.BlockCachePinnedUsage.Set(float64(props.BlockCachePinnedUsage))
-
-	// Cache
-	m.BlockCacheMiss.Set(float64(stats.BlockCacheMiss))
-	m.BlockCacheHit.Set(float64(stats.BlockCacheHit))
-	m.BlockCacheAdd.Set(float64(stats.BlockCacheAdd))
-	m.BlockCacheAddFailures.Set(float64(stats.BlockCacheAddFailures))
-}
-
 func registerMetrics() {
-	labels := make([]string, 0)
-
 	if rocksdbMetrics != nil {
+		// metrics already registered
 		return
 	}
 
+	labels := make([]string, 0)
 	rocksdbMetrics = &Metrics{
 		// Keys
 		NumberKeysWritten: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
@@ -160,3 +136,27 @@ func registerMetrics() {
 		}, labels),
 	}
 }
+
+func (m *Metrics) set(props *properties, stats *stats) {
+	// Keys
+	m.NumberKeysWritten.Set(float64(stats.NumberKeysWritten))
+	m.NumberKeysRead.Set(float64(stats.NumberKeysRead))
+	m.NumberKeysUpdated.Set(float64(stats.NumberKeysUpdated))
+	m.EstimateNumKeys.Set(float64(props.EstimateNumKeys))
+
+	// Files
+	m.NumberFileOpens.Set(float64(stats.NumberFileOpens))
+	m.NumberFileErrors.Set(float64(stats.NumberFileErrors))
+
+	// Memory
+	m.BlockCacheUsage.Set(float64(props.BlockCacheUsage))
+	m.EstimateTableReadersMem.Set(float64(props.EstimateTableReadersMem))
+	m.CurSizeAllMemTables.Set(float64(props.CurSizeAllMemTables))
+	m.BlockCachePinnedUsage.Set(float64(props.BlockCachePinnedUsage))
+
+	// Cache
+	m.BlockCacheMiss.Set(float64(stats.BlockCacheMiss))
+	m.BlockCacheHit.Set(float64(stats.BlockCacheHit))
+	m.BlockCacheAdd.Set(float64(stats.BlockCacheAdd))
+	m.BlockCacheAddFailures.Set(float64(stats.BlockCacheAddFailures))
+}

cmd/kava/opendb/opendb_rocksdb.go

@@ -140,29 +140,18 @@ func newRocksDBWithOptions(name string, dir string, dbOpts, cfOpts *grocksdb.Opt
 		return nil, fmt.Errorf("failed to create db path: %w", err)
 	}
 
-	dbOpts.EnableStatistics()
+	if enableMetrics {
+		dbOpts.EnableStatistics()
+	}
+
 	db, _, err := grocksdb.OpenDbColumnFamilies(dbOpts, dbPath, []string{defaultColumnFamilyName}, []*grocksdb.Options{cfOpts})
 	if err != nil {
 		return nil, err
 	}
 
 	if enableMetrics {
 		registerMetrics()
-
-		go func() {
-			ticker := time.NewTicker(time.Second * 15)
-			for {
-				select {
-				case <-ticker.C:
-					props, stats, err := getPropsAndStats(db)
-					if err != nil {
-						continue
-					}
-
-					rocksdbMetrics.send(props, stats)
-				}
-			}
-		}()
+		go reportMetrics(db)
 	}
 
 	ro := grocksdb.NewDefaultReadOptions()
@@ -194,6 +183,21 @@ func newDefaultOptions() *grocksdb.Options {
 	return opts
 }
 
+func reportMetrics(db *grocksdb.DB) {
+	ticker := time.NewTicker(time.Second * 15)
+	for {
+		select {
+		case <-ticker.C:
+			props, stats, err := getPropsAndStats(db)
+			if err != nil {
+				continue
+			}
+
+			rocksdbMetrics.set(props, stats)
+		}
+	}
+}
+
 func getPropsAndStats(db *grocksdb.DB) (*properties, *stats, error) {
 	propsLoader := newPropsLoader(db)
 	props, err := propsLoader.load()