From: John Spray <john.spray@inktank.com>
Date: Sat, 1 Mar 2014 17:01:10 +0000 (+0000)
Subject: mon: fix 'pg dump' JSON output
X-Git-Tag: v0.78~110^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e19dffb88daef05167ffdd612290e83a388ba3a5;p=ceph.git

mon: fix 'pg dump' JSON output

This was broken by 40bdcb88.  The 'acting' array had
the up_primary and acting_primary appended.

Fixes: #7572

Signed-off-by: John Spray <john.spray@inktank.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index f0a82a8a56ee..2832e8654403 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1541,9 +1541,9 @@ void pg_stat_t::dump(Formatter *f) const
   f->open_array_section("acting");
   for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
+  f->close_section();
   f->dump_int("up_primary", up_primary);
   f->dump_int("acting_primary", acting_primary);
-  f->close_section();
 }
 
 void pg_stat_t::dump_brief(Formatter *f) const
@@ -1556,9 +1556,9 @@ void pg_stat_t::dump_brief(Formatter *f) const
   f->open_array_section("acting");
   for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
+  f->close_section();
   f->dump_int("up_primary", up_primary);
   f->dump_int("acting_primary", acting_primary);
-  f->close_section();
 }
 
 void pg_stat_t::encode(bufferlist &bl) const