From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Aug 2014 16:14:40 +0000 (-0700)
Subject: mon/PGMonitor: add _bytes fields for all usage dumps
X-Git-Tag: v0.85~87^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adb2791adfbbe17aabf13eca9ef9cd5ded0865fd;p=ceph.git

mon/PGMonitor: add _bytes fields for all usage dumps

Leave the _kb ones in place for now.

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

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index a097c5e57805..7e974c2200fd 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1232,8 +1232,10 @@ void PGMonitor::dump_object_stat_sum(TextTable &tbl, Formatter *f,
       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 {
     tbl << stringify(si_t(sum.num_bytes));
@@ -1392,8 +1394,11 @@ 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);
     }