From 5531e3b0f5713718e6bb4d3a2dfd31cca794a9c8 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 3 Jul 2018 13:48:38 -0700 Subject: [PATCH] mvcc: add "etcd_mvcc_db_total_size_in_bytes" Signed-off-by: Gyuho Lee --- mvcc/kvstore.go | 4 +++- mvcc/metrics.go | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 28a18a065..9b61a8153 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -217,7 +217,9 @@ func (s *store) txnEnd(txnID int64) error { } s.currentRev.sub = 0 - dbTotalSize.Set(float64(s.b.Size())) + dbSize := float64(s.b.Size()) + dbTotalSizeDebugging.Set(dbSize) + dbTotalSize.Set(dbSize) s.mu.Unlock() return nil } diff --git a/mvcc/metrics.go b/mvcc/metrics.go index aa8af6aa5..924ebd05f 100644 --- a/mvcc/metrics.go +++ b/mvcc/metrics.go @@ -129,11 +129,17 @@ var ( Buckets: prometheus.ExponentialBuckets(100, 2, 14), }) - dbTotalSize = prometheus.NewGauge(prometheus.GaugeOpts{ + dbTotalSizeDebugging = prometheus.NewGauge(prometheus.GaugeOpts{ Namespace: "etcd_debugging", Subsystem: "mvcc", Name: "db_total_size_in_bytes", - Help: "Total size of the underlying database in bytes.", + Help: "Total size of the underlying database physically allocated in bytes. Use etcd_mvcc_db_total_size_in_bytes", + }) + dbTotalSize = prometheus.NewGauge(prometheus.GaugeOpts{ + Namespace: "etcd", + Subsystem: "mvcc", + Name: "db_total_size_in_bytes", + Help: "Total size of the underlying database physically allocated in bytes.", }) ) @@ -151,6 +157,7 @@ func init() { prometheus.MustRegister(indexCompactionPauseDurations) prometheus.MustRegister(dbCompactionPauseDurations) prometheus.MustRegister(dbCompactionTotalDurations) + prometheus.MustRegister(dbTotalSizeDebugging) prometheus.MustRegister(dbTotalSize) }