mon/PGMonitor: add _bytes perf counters

Leave the _kb ones in place for now.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index df1f68eda54733ada0971d90d71f85c8ed6dfd47..c4cc5e416d15ea8391bb2ff56a925a14ffc08947 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -465,6 +465,9 @@ int Monitor::preinit()
     pcb.add_u64(l_cluster_osd_kb, "osd_kb");
     pcb.add_u64(l_cluster_osd_kb_used, "osd_kb_used");
     pcb.add_u64(l_cluster_osd_kb_avail, "osd_kb_avail");
+    pcb.add_u64(l_cluster_osd_bytes, "osd_bytes");
+    pcb.add_u64(l_cluster_osd_bytes_used, "osd_bytes_used");
+    pcb.add_u64(l_cluster_osd_bytes_avail, "osd_bytes_avail");
     pcb.add_u64(l_cluster_num_pool, "num_pool");
     pcb.add_u64(l_cluster_num_pg, "num_pg");
     pcb.add_u64(l_cluster_num_pg_active_clean, "num_pg_active_clean");

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index a1504774afab4ac7a3faa97aa466de5b9a03f150..b6d309ae015e2d6b88081e6ad6e49171b0d25999 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -69,6 +69,9 @@ enum {
   l_cluster_osd_kb,
   l_cluster_osd_kb_used,
   l_cluster_osd_kb_avail,
+  l_cluster_osd_bytes,
+  l_cluster_osd_bytes_used,
+  l_cluster_osd_bytes_avail,
   l_cluster_num_pool,
   l_cluster_num_pg,
   l_cluster_num_pg_active_clean,

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 7e974c2200fd5f91e5f1b70f71630460c93c844f..74adeae32a412396a2ea2a240b2480d28d398fb7 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -91,6 +91,12 @@ void PGMonitor::update_logger()
   mon->cluster_logger->set(l_cluster_osd_kb_used, pg_map.osd_sum.kb_used);
   mon->cluster_logger->set(l_cluster_osd_kb_avail, pg_map.osd_sum.kb_avail);
 
+  mon->cluster_logger->set(l_cluster_osd_bytes, pg_map.osd_sum.kb * 1024ull);
+  mon->cluster_logger->set(l_cluster_osd_bytes_used,
+                          pg_map.osd_sum.kb_used * 1024ull);
+  mon->cluster_logger->set(l_cluster_osd_bytes_avail,
+                          pg_map.osd_sum.kb_avail * 1024ull);
+
   mon->cluster_logger->set(l_cluster_num_pool, pg_map.pg_pool_sum.size());
   mon->cluster_logger->set(l_cluster_num_pg, pg_map.pg_stat.size());