From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 28 Jun 2018 22:57:05 +0000 (-0700)
Subject: client: add inst to asok status output
X-Git-Tag: v12.2.8~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23107%2Fhead;p=ceph.git

client: add inst to asok status output

Makes it easier for checking if a client becomes blacklisted.

Fixes: http://tracker.ceph.com/issues/24724

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 47c67d584e204d56c2a5f9a414082bb523098015)
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 41eff1b4b2a2..bbbba40c2fdb 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -448,6 +448,10 @@ void Client::dump_status(Formatter *f)
     f->dump_int("dentry_count", lru.lru_get_size());
     f->dump_int("dentry_pinned_count", lru.lru_get_num_pinned());
     f->dump_int("id", get_nodeid().v);
+    entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr());
+    f->dump_object("inst", inst);
+    f->dump_stream("inst_str") << inst;
+    f->dump_stream("addr_str") << inst.addr;
     f->dump_int("inode_count", inode_map.size());
     f->dump_int("mds_epoch", mdsmap->get_epoch());
     f->dump_int("osd_epoch", osd_epoch);
@@ -1506,6 +1510,10 @@ void Client::connect_mds_targets(mds_rank_t mds)
 void Client::dump_mds_sessions(Formatter *f)
 {
   f->dump_int("id", get_nodeid().v);
+  entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr());
+  f->dump_object("inst", inst);
+  f->dump_stream("inst_str") << inst;
+  f->dump_stream("addr_str") << inst.addr;
   f->open_array_section("sessions");
   for (map<mds_rank_t,MetaSession*>::const_iterator p = mds_sessions.begin(); p != mds_sessions.end(); ++p) {
     f->open_object_section("session");