From f30843581d0809d7b11d6e6d91d85ea6fd7fe8d6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Jun 2018 12:30:56 -0500 Subject: [PATCH] mgr: myaddr -> myaddrs Signed-off-by: Sage Weil --- src/mgr/DaemonServer.cc | 4 ++-- src/mgr/DaemonServer.h | 2 +- src/mgr/Mgr.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 257177ea1563..bb3ce29ae1fa 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -94,7 +94,7 @@ DaemonServer::~DaemonServer() { g_conf->remove_observer(this); } -int DaemonServer::init(uint64_t gid, entity_addr_t client_addr) +int DaemonServer::init(uint64_t gid, entity_addrvec_t client_addrs) { // Initialize Messenger std::string public_msgr_type = g_conf->ms_public_type.empty() ? @@ -134,7 +134,7 @@ int DaemonServer::init(uint64_t gid, entity_addr_t client_addr) } msgr->set_myname(entity_name_t::MGR(gid)); - msgr->set_addr_unknowns(entity_addrvec_t(client_addr)); + msgr->set_addr_unknowns(client_addrs); msgr->start(); msgr->add_dispatcher_tail(this); diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h index 6817d2357b7e..11c716c2215a 100644 --- a/src/mgr/DaemonServer.h +++ b/src/mgr/DaemonServer.h @@ -104,7 +104,7 @@ private: void maybe_ready(int32_t osd_id); public: - int init(uint64_t gid, entity_addr_t client_addr); + int init(uint64_t gid, entity_addrvec_t client_addrs); void shutdown(); entity_addrvec_t get_myaddrs() const; diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc index 26142d84bfd1..2b27038ab64a 100644 --- a/src/mgr/Mgr.cc +++ b/src/mgr/Mgr.cc @@ -221,7 +221,7 @@ void Mgr::init() assert(!initialized); // Start communicating with daemons to learn statistics etc - int r = server.init(monc->get_global_id(), client_messenger->get_myaddr()); + int r = server.init(monc->get_global_id(), client_messenger->get_myaddrs()); if (r < 0) { derr << "Initialize server fail: " << cpp_strerror(r) << dendl; // This is typically due to a bind() failure, so let's let -- 2.47.3