From ee2dbdb0f5e54fe6f9c5999c032063b084424c4c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 6 Aug 2014 09:31:59 -0700 Subject: [PATCH] mon/PGMonitor: remove {rd,wr}_kb from pool stat dumps These fields are replaced with corresponding *_bytes fields. Signed-off-by: Sage Weil --- PendingReleaseNotes | 6 ++++++ src/mon/PGMonitor.cc | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 3369803d02e23..2bbd47c3c3313 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -5,3 +5,9 @@ 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). + +* The rd_kb and wr_kb fields in the JSON dumps for pool stats (accessed via + the 'ceph df detail -f json-pretty' and related commands) have been replaced + with corresponding *_bytes fields. Similarly, the 'total_space', 'total_used', + and 'total_avail' fields are replaced with 'total_bytes', 'total_used_bytes', + and 'total_avail_bytes' fields. diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 351db930fc400..807a93d3800a0 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -1233,10 +1233,8 @@ void PGMonitor::dump_object_stat_sum(TextTable &tbl, Formatter *f, if (verbose) { f->dump_int("dirty", sum.num_objects_dirty); f->dump_int("rd", sum.num_rd); - f->dump_int("rd_kb", sum.num_rd_kb); f->dump_int("rd_bytes", sum.num_rd_kb * 1024ull); f->dump_int("wr", sum.num_wr); - f->dump_int("wr_kb", sum.num_wr_kb); f->dump_int("wr_bytes", sum.num_wr_kb * 1024ull); } } else { @@ -1395,11 +1393,8 @@ void PGMonitor::dump_fs_stats(stringstream &ss, Formatter *f, bool verbose) { if (f) { f->open_object_section("stats"); - f->dump_int("total_space", pg_map.osd_sum.kb); f->dump_int("total_bytes", pg_map.osd_sum.kb * 1024ull); - f->dump_int("total_used", pg_map.osd_sum.kb_used); f->dump_int("total_used_bytes", pg_map.osd_sum.kb_used * 1024ull); - f->dump_int("total_avail", pg_map.osd_sum.kb_avail); f->dump_int("total_avail_bytes", pg_map.osd_sum.kb_avail * 1024ull); if (verbose) { f->dump_int("total_objects", pg_map.pg_sum.stats.sum.num_objects); -- 2.39.5