From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Jun 2018 22:05:10 +0000 (-0500)
Subject: mds: use new pick_addresses
X-Git-Tag: v14.0.1~951^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22086a78da9386bfd0aa03aa0a21b036ef869611;p=ceph.git

mds: use new pick_addresses

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

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 123147d462bd..6f3ee2444d56 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -131,7 +131,8 @@ int main(int argc, const char **argv)
 
   Preforker forker;
 
-  pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
+  entity_addrvec_t addrs;
+  pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC, &addrs);
 
   // Normal startup
   if (g_conf->name.has_default_id()) {
@@ -188,7 +189,7 @@ int main(int argc, const char **argv)
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
                    Messenger::Policy::stateful_server(0));
 
-  int r = msgr->bind(g_conf->public_addr);
+  int r = msgr->bindv(addrs);
   if (r < 0)
     forker.exit(1);