client: fix dump_mds_requests to valid json format

Usually asok command output will be valid json, but mds_requests
outputs duplicate key "request", which is not convenient for
subsequent parsing.

Fixes: http://tracker.ceph.com/issues/73639
Signed-off-by: haoyixing <haoyixing03@kuaishou.com>
(cherry picked from commit 326fb6107bede3b123e2c8b1a08db123becc161e)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 56a07af9577d6ffe98dcf6e2a5b195ff1d51a6ee..827f869db72eead038914a783fac24612677a505 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1977,6 +1977,7 @@ void Client::dump_mds_sessions(Formatter *f, bool cap_dump)
 
 void Client::dump_mds_requests(Formatter *f)
 {
+  f->open_array_section("requests");
   for (map<ceph_tid_t, MetaRequest*>::iterator p = mds_requests.begin();
        p != mds_requests.end();
        ++p) {
@@ -1984,6 +1985,7 @@ void Client::dump_mds_requests(Formatter *f)
     p->second->dump(f);
     f->close_section();
   }
+  f->close_section();
 }
 
 int Client::verify_reply_trace(int r, MetaSession *session,