From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Jan 2019 15:23:12 +0000 (-0600)
Subject: mgr/ServiceMap: print daemon addr in legacy format
X-Git-Tag: v14.1.0~465^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25835%2Fhead;p=ceph.git

mgr/ServiceMap: print daemon addr in legacy format

The v1/v2 prefix isn't useful anyway since the client can connect via
any protocol.

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

diff --git a/src/mgr/ServiceMap.cc b/src/mgr/ServiceMap.cc
index e873aa7eee29..ba7a43b24a8f 100644
--- a/src/mgr/ServiceMap.cc
+++ b/src/mgr/ServiceMap.cc
@@ -34,7 +34,7 @@ void ServiceMap::Daemon::dump(Formatter *f) const
   f->dump_unsigned("start_epoch", start_epoch);
   f->dump_stream("start_stamp") << start_stamp;
   f->dump_unsigned("gid", gid);
-  f->dump_stream("addr") << addr;
+  f->dump_string("addr", addr.get_legacy_str());
   f->open_object_section("metadata");
   for (auto& p : metadata) {
     f->dump_string(p.first.c_str(), p.second);