From: Yanhu Cao <gmayyyha@gmail.com>
Date: Thu, 13 Aug 2020 07:35:08 +0000 (+0800)
Subject: mds: make caps dump more readable
X-Git-Tag: v16.1.0~1181^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e23dacb4006930b1c1936ebbaadfffaedf87954c;p=ceph.git

mds: make caps dump more readable

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
---

diff --git a/src/mds/Capability.cc b/src/mds/Capability.cc
index 76ae3291d7cf..491da3cc7f16 100644
--- a/src/mds/Capability.cc
+++ b/src/mds/Capability.cc
@@ -57,9 +57,9 @@ void Capability::Export::decode(ceph::buffer::list::const_iterator &p)
 void Capability::Export::dump(ceph::Formatter *f) const
 {
   f->dump_unsigned("cap_id", cap_id);
-  f->dump_unsigned("wanted", wanted);
-  f->dump_unsigned("issued", issued);
-  f->dump_unsigned("pending", pending);
+  f->dump_stream("wanted") << ccap_string(wanted);
+  f->dump_stream("issued") << ccap_string(issued);
+  f->dump_stream("pending") << ccap_string(pending);
   f->dump_unsigned("client_follows", client_follows);
   f->dump_unsigned("seq", seq);
   f->dump_unsigned("migrate_seq", mseq);
@@ -257,10 +257,12 @@ void Capability::decode(ceph::buffer::list::const_iterator &bl)
 
 void Capability::dump(ceph::Formatter *f) const
 {
+  if (inode)
+    f->dump_stream("ino") << inode->ino();
   f->dump_unsigned("last_sent", last_sent);
-  f->dump_unsigned("last_issue_stamp", last_issue_stamp);
-  f->dump_unsigned("wanted", _wanted);
-  f->dump_unsigned("pending", _pending);
+  f->dump_stream("last_issue_stamp") << last_issue_stamp;
+  f->dump_stream("wanted") << ccap_string(_wanted);
+  f->dump_stream("pending") << ccap_string(_pending);
 
   f->open_array_section("revokes");
   for (const auto &r : _revokes) {