From fa3fb1de4e1fc8c791e57e917e6ee1d8c231feb4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 6 Sep 2020 14:44:12 +0800 Subject: [PATCH] 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 --- src/osd/PeeringState.cc | 1 + src/osd/PrimaryLogPG.cc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc index 737601b57e8..b9578277ac6 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 a75651e5075..3bba568ce4c 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()); -- 2.47.3