From 23864bc86fb213183cb323213aff8582c5b61653 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 28 Jun 2018 15:57:05 -0700 Subject: [PATCH] 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 (cherry picked from commit 47c67d584e204d56c2a5f9a414082bb523098015) --- src/client/Client.cc | 8 ++++++++ 1 file changed, 8 insertions(+) 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::const_iterator p = mds_sessions.begin(); p != mds_sessions.end(); ++p) { f->open_object_section("session"); -- 2.47.3