From: Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
Date: Fri, 10 Oct 2014 12:27:56 +0000 (-0400)
Subject: Fixed JSON output for stray OSDs
X-Git-Tag: v0.88~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2721%2Fhead;p=ceph.git

Fixed JSON output for stray OSDs
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index ed9b7e7ecf6b..2d74fd79d440 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2446,17 +2446,17 @@ void OSDMap::print_tree(ostream *out, Formatter *f) const
   if (!stray.empty()) {
     if (out)
       *out << "\n";
-    if (f)
-      f->open_object_section("osd");
     for (set<int>::iterator p = stray.begin(); p != stray.end(); ++p) {
       if (out)
 	*out << *p << "\t0\t";
+      if (f)
+        f->open_object_section("osd");
       print_osd_line(*p, out, f);
       if (out)
 	*out << "\n";
+      if (f)
+        f->close_section();
     }
-    if (f)
-      f->close_section();
   }
   if (f)
     f->close_section();