From: Yanhu Cao <gmayyyha@gmail.com>
Date: Wed, 15 Aug 2018 09:49:51 +0000 (+0800)
Subject: mon/PGMap: command 'ceph df -f json' output add total_percent_used
X-Git-Tag: v14.0.1~559^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8757652c1190efa6e4037992ed7961a3729fa08f;p=ceph.git

mon/PGMap: command 'ceph df -f json' output add total_percent_used

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 1c622625eb10..d33aee3ee928 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -818,11 +818,17 @@ void PGMapDigest::dump_pool_stats_full(
 
 void PGMapDigest::dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const
 {
+  float used = 0.0;
+  if (osd_sum.kb > 0) {
+    used = ((float)osd_sum.kb_used / osd_sum.kb);
+  }
+
   if (f) {
     f->open_object_section("stats");
     f->dump_int("total_bytes", osd_sum.kb * 1024ull);
     f->dump_int("total_used_bytes", osd_sum.kb_used * 1024ull);
     f->dump_int("total_avail_bytes", osd_sum.kb_avail * 1024ull);
+    f->dump_float("total_percent_used", used * 100);
     if (verbose) {
       f->dump_int("total_objects", pg_sum.stats.sum.num_objects);
     }
@@ -840,10 +846,6 @@ void PGMapDigest::dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) co
     tbl << stringify(byte_u_t(osd_sum.kb*1024))
         << stringify(byte_u_t(osd_sum.kb_avail*1024))
         << stringify(byte_u_t(osd_sum.kb_used*1024));
-    float used = 0.0;
-    if (osd_sum.kb > 0) {
-      used = ((float)osd_sum.kb_used / osd_sum.kb);
-    }
     tbl << percentify(used*100);
     if (verbose) {
       tbl << stringify(si_u_t(pg_sum.stats.sum.num_objects));