]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
client: maintain compat for {inst,addr}_str in status dump
authorSage Weil <sage@redhat.com>
Tue, 1 Jan 2019 20:08:59 +0000 (14:08 -0600)
committerSage Weil <sage@redhat.com>
Thu, 3 Jan 2019 17:17:38 +0000 (11:17 -0600)
Add 'addr' field too.

Signed-off-by: Sage Weil <sage@redhat.com>
src/client/Client.cc

index 5836d92319623027fee142e9b0de309f967e81d7..4ee14b7f1d7c35219cc4f0eeaa695a36b1e102a9 100644 (file)
@@ -465,8 +465,9 @@ void Client::dump_status(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->dump_object("addr", inst.addr);
+    f->dump_stream("inst_str") << inst.name << " " << inst.addr.get_legacy_str();
+    f->dump_string("addr_str", inst.addr.get_legacy_str());
     f->dump_int("inode_count", inode_map.size());
     f->dump_int("mds_epoch", mdsmap->get_epoch());
     f->dump_int("osd_epoch", osd_epoch);