]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
client: add inst to asok status output
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 28 Jun 2018 22:57:05 +0000 (15:57 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 2 Jul 2018 21:37:35 +0000 (14:37 -0700)
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>
src/client/Client.cc

index 61ba77eddf97025c90f5b0e33ec373458bde4b71..9c4a5cd85a1b087af18c8307af66ad0768c73e67 100644 (file)
@@ -449,6 +449,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 (const auto &p : mds_sessions) {
     f->open_object_section("session");