From: chuanhong.wang <chuanhong.wang@163.com>
Date: Fri, 20 Jan 2017 04:14:08 +0000 (+0800)
Subject: mon: in output of "ceph osd df tree", display "-", not "0", for pg amount of a bucket
X-Git-Tag: v12.0.1~476^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4a5d7b946041ad3182de142d730794307a82343;p=ceph.git

mon: in output of "ceph osd df tree", display "-", not "0", for pg amount of a bucket

Signed-off-by: Chuanhong Hong  <chuanhong.wang@163.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 082eee77df69..2f8e01a804c9 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -644,7 +644,7 @@ protected:
     if (average_util)
       var = util / average_util;
 
-    size_t num_pgs = pgm->get_num_pg_by_osd(qi.id);
+    size_t num_pgs = qi.is_bucket() ? 0 : pgm->get_num_pg_by_osd(qi.id);
 
     dump_item(qi, reweight, kb, kb_used, kb_avail, util, var, num_pgs, f);
 
@@ -798,8 +798,13 @@ protected:
 	 << si_t(kb_used << 10)
 	 << si_t(kb_avail << 10)
 	 << lowprecision_t(util)
-	 << lowprecision_t(var)
-	 << num_pgs;
+	 << lowprecision_t(var);
+
+    if (qi.is_bucket()) {
+      *tbl << "-";
+    } else {
+      *tbl << num_pgs;
+    }
 
     if (tree) {
       ostringstream name;