mon: remove *_kb perf counters

This is an incompatible change.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 178363cff5e17addd6d75572b3314c4cd1430a3a..3369803d02e23f5fc504b6cb1449f31d0b495195 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -2,3 +2,6 @@
 v0.84
 -----
 
+* The *_kb perf counters on the monitor have been removed.  These are
+  replaced with a new set of *_bytes counters (e.g., cluster_osd_kb is
+  replaced by cluster_osd_bytes).

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c4cc5e416d15ea8391bb2ff56a925a14ffc08947..9b3509438306a2d459aa1e11ee2bf24d674f5ad7 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -462,9 +462,6 @@ int Monitor::preinit()
     pcb.add_u64(l_cluster_num_osd_up, "num_osd_up");
     pcb.add_u64(l_cluster_num_osd_in, "num_osd_in");
     pcb.add_u64(l_cluster_osd_epoch, "osd_epoch");
-    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");

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index b6d309ae015e2d6b88081e6ad6e49171b0d25999..c08e307fa7059810eee75bff243eaec92223a952 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -66,9 +66,6 @@ enum {
   l_cluster_num_osd_up,
   l_cluster_num_osd_in,
   l_cluster_osd_epoch,
-  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,

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 74adeae32a412396a2ea2a240b2480d28d398fb7..351db930fc40043df9dd33b2dfdadf1baaac3079 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -87,10 +87,6 @@ void PGMonitor::update_logger()
 {
   dout(10) << "update_logger" << dendl;
 
-  mon->cluster_logger->set(l_cluster_osd_kb, pg_map.osd_sum.kb);
-  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);