]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/PGMap: use num_pg where available
authorSage Weil <sage@redhat.com>
Sat, 13 May 2017 01:45:29 +0000 (20:45 -0500)
committerSage Weil <sage@redhat.com>
Fri, 2 Jun 2017 17:01:08 +0000 (13:01 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/PGMap.cc

index cdc91838805fe88ffbf76499ad65d742b5d76c7d..08107e6c567f1d0864b8bd19fdc8fbe6de0c2a7a 100644 (file)
@@ -1640,7 +1640,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const
     f->close_section();
 
   if (f) {
-    f->dump_unsigned("num_pgs", pg_stat.size());
+    f->dump_unsigned("num_pgs", num_pg);
     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);
@@ -1649,7 +1649,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const
     f->dump_unsigned("bytes_total", osd_sum.kb * 1024ull);
   } else {
     *out << "    pools:   " << pg_pool_sum.size() << " pools, "
-         << pg_stat.size() << " pgs\n";
+         << num_pg << " pgs\n";
     *out << "    objects: " << si_t(pg_sum.stats.sum.num_objects) << " objects, "
          << prettybyte_t(pg_sum.stats.sum.num_bytes) << "\n";
     *out << "    usage:   "
@@ -1659,7 +1659,6 @@ void PGMap::print_summary(Formatter *f, ostream *out) const
     *out << "    pgs:     ";
   }
 
-
   bool pad = false;
   if (num_pg_active < num_pg) {
     float p = (float)num_pg_active / (float)num_pg;