From: Sage Weil <sage@inktank.com>
Date: Wed, 4 Jul 2012 20:59:04 +0000 (-0700)
Subject: osd: add missing formatter close_section() to scrub status
X-Git-Tag: v0.49~20^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74f687501a8a02ef248a76f061fbc4d862a9abc4;p=ceph.git

osd: add missing formatter close_section() to scrub status

Also add braces to make the open/close matchups easier to see.  Broken
by f36617392710f9b3538bfd59d45fd72265993d57.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 57fe824bf296..b3677fa8570d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4319,19 +4319,24 @@ boost::statechart::result PG::RecoveryState::Active::react(const QueryState& q)
     q.f->close_section();
   }
 
-  q.f->open_object_section("scrub");
-  q.f->dump_stream("scrub_epoch_start") << pg->scrub_epoch_start;
-  q.f->dump_int("scrub_active", pg->scrub_active);
-  q.f->dump_int("scrub_block_writes", pg->scrub_block_writes);
-  q.f->dump_int("finalizing_scrub", pg->finalizing_scrub);
-  q.f->dump_int("scrub_waiting_on", pg->scrub_waiting_on);
-  q.f->open_array_section("scrub_waiting_on_whom");
-  for (set<int>::iterator p = pg->scrub_waiting_on_whom.begin();
-       p != pg->scrub_waiting_on_whom.end();
-       ++p) {
-    q.f->dump_int("osd", *p);
+  {
+    q.f->open_object_section("scrub");
+    q.f->dump_stream("scrub_epoch_start") << pg->scrub_epoch_start;
+    q.f->dump_int("scrub_active", pg->scrub_active);
+    q.f->dump_int("scrub_block_writes", pg->scrub_block_writes);
+    q.f->dump_int("finalizing_scrub", pg->finalizing_scrub);
+    q.f->dump_int("scrub_waiting_on", pg->scrub_waiting_on);
+    {
+      q.f->open_array_section("scrub_waiting_on_whom");
+      for (set<int>::iterator p = pg->scrub_waiting_on_whom.begin();
+	   p != pg->scrub_waiting_on_whom.end();
+	   ++p) {
+	q.f->dump_int("osd", *p);
+      }
+      q.f->close_section();
+    }
+    q.f->close_section();
   }
-  q.f->close_section();
 
   q.f->close_section();
   return forward_event();