From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Jan 2019 20:08:59 +0000 (-0600)
Subject: client: maintain compat for {inst,addr}_str in status dump
X-Git-Tag: v14.1.0~484^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e09ca7b80b9ad90e75a2651e47ddc0d0d68477de;p=ceph.git

client: maintain compat for {inst,addr}_str in status dump

Add 'addr' field too.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 5836d9231962..4ee14b7f1d7c 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -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);