From: Sage Weil <sage@redhat.com>
Date: Sat, 13 May 2017 01:41:01 +0000 (-0500)
Subject: mon/PGMap: remove version from summary
X-Git-Tag: ses5-milestone6~8^2~19^2~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39d524a433d6ec84044dddba26b30118b06bd917;p=ceph.git

mon/PGMap: remove version from summary

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 89073d9fa7a..cdc91838805 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1640,7 +1640,6 @@ void PGMap::print_summary(Formatter *f, ostream *out) const
     f->close_section();
 
   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);
@@ -1758,16 +1757,14 @@ void PGMap::print_oneline_summary(Formatter *f, ostream *out) const
 
   string states = ss.str();
   if (out)
-    *out << "v" << version << ": "
-         << pg_stat.size() << " pgs: "
+    *out << num_pg << " pgs: "
          << states << "; "
          << prettybyte_t(pg_sum.stats.sum.num_bytes) << " data, "
          << kb_t(osd_sum.kb_used) << " used, "
          << kb_t(osd_sum.kb_avail) << " / "
          << kb_t(osd_sum.kb) << " avail";
   if (f) {
-    f->dump_unsigned("version", version);
-    f->dump_unsigned("num_pgs", pg_stat.size());
+    f->dump_unsigned("num_pgs", num_pg);
     f->dump_unsigned("num_bytes", pg_sum.stats.sum.num_bytes);
     f->dump_unsigned("raw_bytes_used", osd_sum.kb_used << 10);
     f->dump_unsigned("raw_bytes_avail", osd_sum.kb_avail << 10);