osd: refactor PrimaryLogPG::do_command("query")

we should let recovery_state.dump_peering_state() close the formatter
section, because it's recovery_state.dump_peering_state(), who opens it.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 737601b57e895970ec2538c1a63dc905d4f0175e..b9578277ac6bca3b32b3f0e6eb43059a34614f3b 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -3668,6 +3668,7 @@ void PeeringState::dump_peering_state(Formatter *f)
     p->second.dump(f);
     f->close_section();
   }
+  f->close_section();
 }
 
 void PeeringState::update_stats(

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index a75651e5075867aa0802cb198287feb39522f265..3bba568ce4c3943ccd8098c1e6e3a7f2e66d64e7 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1001,7 +1001,6 @@ void PrimaryLogPG::do_command(
     f->dump_stream("snap_trimq") << snap_trimq;
     f->dump_unsigned("snap_trimq_len", snap_trimq.size());
     recovery_state.dump_peering_state(f.get());
-    f->close_section();
 
     f->open_array_section("recovery_state");
     handle_query_state(f.get());