mon: print the num_pools and num_objects in 'ceph -s -f json/json-pretty'.

  Fixes: http://tracker.ceph.com/issues/17703
  Signed-off-by: huangjun <hjwsm1989@gmail.com>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index cd59129dec1944eb587280b8da161cbb712e2893..ac97d9d280a747ba36e8935ba1ab2f26a3d72308 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1594,6 +1594,8 @@ void PGMap::print_summary(Formatter *f, ostream *out) const
   if (f) {
     f->dump_unsigned("version", version);
     f->dump_unsigned("num_pgs", pg_stat.size());
+    f->dump_unsigned("num_pools", pg_pool_sum.size());
+    f->dump_unsigned("num_objects", pg_sum.stats.sum.num_objects);
     f->dump_unsigned("data_bytes", pg_sum.stats.sum.num_bytes);
     f->dump_unsigned("bytes_used", osd_sum.kb_used * 1024ull);
     f->dump_unsigned("bytes_avail", osd_sum.kb_avail * 1024ull);