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 082eee77df69341087d722c1ddf11051ba691808..2f8e01a804c963a201204fa61a15ce68af5f8261 100644 (file)
--- 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;