From 7fa85790fb568ade3c68ba116c654eb95240d68c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Jul 2012 13:59:04 -0700 Subject: [PATCH] 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 --- src/osd/PG.cc | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 3d6dc85523ce0..14d415b6e47bd 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4342,19 +4342,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::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::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(); -- 2.39.5