From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Aug 2019 14:21:20 +0000 (-0500)
Subject: mon: remove double-nesting of "osdmap" for ceph status
X-Git-Tag: v15.1.0~1928^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f222c7bb1790f4ab3e8e0afd0c7915ed84f0c6c8;p=ceph-ci.git

mon: remove double-nesting of "osdmap" for ceph status

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index a6910a50a56..6e6732cb4e2 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3965,7 +3965,6 @@ void OSDMap::print_summary(Formatter *f, ostream& out,
 			   const string& prefix, bool extra) const
 {
   if (f) {
-    f->open_object_section("osdmap");
     f->dump_int("epoch", get_epoch());
     f->dump_int("num_osds", get_num_osds());
     f->dump_int("num_up_osds", get_num_up_osds());
@@ -3973,7 +3972,6 @@ void OSDMap::print_summary(Formatter *f, ostream& out,
     f->dump_bool("full", test_flag(CEPH_OSDMAP_FULL) ? true : false);
     f->dump_bool("nearfull", test_flag(CEPH_OSDMAP_NEARFULL) ? true : false);
     f->dump_unsigned("num_remapped_pgs", get_num_pg_temp());
-    f->close_section();
   } else {
     utime_t now = ceph_clock_now();
     out << get_num_osds() << " osds: "