From: Kefu Chai <kchai@redhat.com>
Date: Sun, 6 Sep 2020 06:44:12 +0000 (+0800)
Subject: osd: refactor PrimaryLogPG::do_command("query")
X-Git-Tag: v16.1.0~1178^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa3fb1de4e1fc8c791e57e917e6ee1d8c231feb4;p=ceph.git

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 737601b57e89..b9578277ac6b 100644
--- 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 a75651e50758..3bba568ce4c3 100644
--- 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());