remove all Messenger::get_myaddr() users

Use get_myaddrs() instead and join the glorious future.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 58ffd36d66f54c0deb05ca453f00d905efb39e58..4cb8f4e23d3ef8cb5b568d964c923ccd06baf9ff 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -462,7 +462,7 @@ void Client::dump_status(Formatter *f)
     f->dump_int("dentry_count", lru.lru_get_size());
     f->dump_int("dentry_pinned_count", lru.lru_get_num_pinned());
     f->dump_int("id", get_nodeid().v);
-    entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr());
+    entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr_legacy());
     f->dump_object("inst", inst);
     f->dump_object("addr", inst.addr);
     f->dump_stream("inst_str") << inst.name << " " << inst.addr.get_legacy_str();
@@ -1546,7 +1546,7 @@ void Client::connect_mds_targets(mds_rank_t mds)
 void Client::dump_mds_sessions(Formatter *f)
 {
   f->dump_int("id", get_nodeid().v);
-  entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr());
+  entity_inst_t inst(messenger->get_myname(), messenger->get_myaddr_legacy());
   f->dump_object("inst", inst);
   f->dump_stream("inst_str") << inst;
   f->dump_stream("addr_str") << inst.addr;

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index d628e819d9f65031288c6056a965156e548d6239..02ab387ccf0f488a3d50b64c29fade04cafa2cf8 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -254,8 +254,9 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply)
 
 bool MonClient::ms_dispatch(Message *m)
 {
+#warning fixme, my_addr should be entity_addrvec_t my_addrs
   if (my_addr == entity_addr_t())
-    my_addr = messenger->get_myaddr();
+    my_addr = messenger->get_myaddr_legacy();
 
   // we only care about these message types
   switch (m->get_type()) {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index bbc13f9dc4a578868e9f03519efa6d88b79035a6..b1f1f6a7dafd0293711d0c4120d8838889c94a14 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2218,7 +2218,7 @@ std::string collect_compression_algorithms()
 void Monitor::collect_metadata(Metadata *m)
 {
   collect_sys_info(m, g_ceph_context);
-  (*m)["addr"] = stringify(messenger->get_myaddr());
+  (*m)["addrs"] = stringify(messenger->get_myaddrs());
   (*m)["compression_algorithms"] = collect_compression_algorithms();
 
   // infer storage device
@@ -2256,7 +2256,7 @@ void Monitor::finish_election()
   register_cluster_logger();
 
   // am i named properly?
-  string cur_name = monmap->get_name(messenger->get_myaddr());
+  string cur_name = monmap->get_name(messenger->get_myaddrs());
   if (cur_name != name) {
     dout(10) << " renaming myself from " << cur_name << " -> " << name << dendl;
     send_mon_message(
@@ -3815,7 +3815,7 @@ void Monitor::forward_request_leader(MonOpRequestRef op)
   MonSession *session = op->get_session();
   PaxosServiceMessage *req = op->get_req<PaxosServiceMessage>();
   
-  if (req->get_source().is_mon() && req->get_source_addr() != messenger->get_myaddr()) {
+  if (req->get_source().is_mon() && req->get_source_addrs() != messenger->get_myaddrs()) {
     dout(10) << "forward_request won't forward (non-local) mon request " << *req << dendl;
   } else if (session->proxy_con) {
     dout(10) << "forward_request won't double fwd request " << *req << dendl;

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index c0614b00ddb15f5b831e92a55c43a3df5e3aa9e8..21dfe0bb969aab255140ac6581b9b04688e594b3 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -159,9 +159,6 @@ public:
    * @return A const reference to the address this Messenger
    * currently believes to be its own.
    */
-  entity_addr_t get_myaddr() {
-    return my_addrs->front();
-  }
   const entity_addrvec_t& get_myaddrs() {
     return *my_addrs;
   }

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 1ed18db114d66ccb4f689d0661531ec9c3483b3c..92b0df9cfb7632554e8f3a3da1ad2214fd6a0d65 100644 (file)
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -372,8 +372,8 @@ void AsyncConnection::process() {
 
       SocketOptions opts;
       opts.priority = async_msgr->get_socket_priority();
-      opts.connect_bind_addr = msgr->get_myaddr();
-      ssize_t r = worker->connect(get_peer_addr(), opts, &cs);
+      opts.connect_bind_addr = msgr->get_myaddrs().front();
+      ssize_t r = worker->connect(target_addr, opts, &cs);
       if (r < 0) {
         protocol->fault();
         return;

diff --git a/src/msg/simple/Accepter.cc b/src/msg/simple/Accepter.cc
index e647594079afbaf175a97c58510939586eb7a169..52f3df2bcc02e86309f76ef91b3952979afc69e9 100644 (file)
--- a/src/msg/simple/Accepter.cc
+++ b/src/msg/simple/Accepter.cc
@@ -219,10 +219,10 @@ int Accepter::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
   else
     ceph_assert(msgr->get_need_addr());  // should still be true.
 
-  if (msgr->get_myaddr().get_port() == 0) {
+  if (msgr->get_myaddr_legacy().get_port() == 0) {
     msgr->set_myaddrs(entity_addrvec_t(listen_addr));
   }
-  entity_addr_t addr = msgr->get_myaddr();
+  entity_addr_t addr = msgr->get_myaddr_legacy();
   addr.nonce = nonce;
   msgr->set_myaddrs(entity_addrvec_t(addr));
 
@@ -245,7 +245,7 @@ int Accepter::rebind(const set<int>& avoid_ports)
 {
   ldout(msgr->cct,1) << __func__ << " avoid " << avoid_ports << dendl;
   
-  entity_addr_t addr = msgr->get_myaddr();
+  entity_addr_t addr = msgr->get_myaddr_legacy();
   set<int> new_avoid = avoid_ports;
   new_avoid.insert(addr.get_port());
   addr.set_port(0);

diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 44886ce361c41e27ff545fbf01de8153dc2843dd..8f5d45763c0c7918499637dd3e34404d45c64d00 100644 (file)
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -45,7 +45,8 @@
 #undef dout_prefix
 #define dout_prefix *_dout << *this
 ostream& Pipe::_pipe_prefix(std::ostream &out) const {
-  return out << "-- " << msgr->get_myaddr() << " >> " << peer_addr << " pipe(" << this
+  return out << "-- " << msgr->get_myaddr_legacy() << " >> " << peer_addr
+            << " pipe(" << this
             << " sd=" << sd << " :" << port
              << " s=" << state
              << " pgs=" << peer_global_seq
@@ -959,7 +960,7 @@ void Pipe::set_socket_options()
     if (!peer_addr.is_blank_ip()) {
       addr_family = peer_addr.get_family();
     } else {
-      addr_family = msgr->get_myaddr().get_family();
+      addr_family = msgr->get_myaddr_legacy().get_family();
     }
     switch (addr_family) {
     case AF_INET:
@@ -1036,7 +1037,7 @@ int Pipe::connect()
   set_socket_options();
 
   {
-    entity_addr_t addr2bind = msgr->get_myaddr();
+    entity_addr_t addr2bind = msgr->get_myaddr_legacy();
     if (msgr->cct->_conf->ms_bind_before_connect && (!addr2bind.is_blank_ip())) {
       addr2bind.set_port(0);
       int r = ::bind(sd , addr2bind.get_sockaddr(), addr2bind.get_sockaddr_len());

diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index 1252e784449d48cb47c484a7b0ad7c13e4abc178..2c92fb04a33610d5011364cffd4e94523697567f 100644 (file)
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -30,7 +30,7 @@
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, this)
 static ostream& _prefix(std::ostream *_dout, SimpleMessenger *msgr) {
-  return *_dout << "-- " << msgr->get_myaddr() << " ";
+  return *_dout << "-- " << msgr->get_myaddr_legacy() << " ";
 }
 
 
@@ -70,7 +70,7 @@ SimpleMessenger::~SimpleMessenger()
 
 void SimpleMessenger::ready()
 {
-  ldout(cct,10) << "ready " << get_myaddr() << dendl;
+  ldout(cct,10) << "ready " << get_myaddr_legacy() << dendl;
   dispatch_queue.start();
 
   lock.Lock();
@@ -82,7 +82,7 @@ void SimpleMessenger::ready()
 
 int SimpleMessenger::shutdown()
 {
-  ldout(cct,10) << "shutdown " << get_myaddr() << dendl;
+  ldout(cct,10) << "shutdown " << get_myaddr_legacy() << dendl;
   mark_down_all();
 
   // break ref cycles on the loopback connection

diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index 722ac6dbd237c09aeda7ed358b875600ebfb910f..dec7d0c70ac8d6c44c95594f6d7508bf8fd671af 100644 (file)
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -344,7 +344,7 @@ void XioInit::package_init(CephContext *cct) {
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, this)
 static ostream& _prefix(std::ostream *_dout, XioMessenger *msgr) {
-  return *_dout << "-- " << msgr->get_myaddr() << " ";
+  return *_dout << "-- " << msgr->get_myaddr_legacy() << " ";
 }
 
 XioMessenger::XioMessenger(CephContext *cct, entity_name_t name,

diff --git a/src/msg/xio/XioMsg.h b/src/msg/xio/XioMsg.h
index b21e1835c36a3095d7e03ec2a4504b678740e346..99968fd9fb893a8d695713c5093848ed96820b7b 100644 (file)
--- a/src/msg/xio/XioMsg.h
+++ b/src/msg/xio/XioMsg.h
@@ -263,7 +263,7 @@ public:
     {
       const entity_inst_t &inst = xcon->get_messenger()->get_myinst();
       hdr.peer_type = inst.name.type();
-      hdr.addr = xcon->get_messenger()->get_myaddr();
+      hdr.addr = xcon->get_messenger()->get_myaddr_legacy();
       hdr.hdr->src.type = inst.name.type();
       hdr.hdr->src.num = inst.name.num();
       hdr.msg_cnt = _ex_cnt+1;

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 14778672d1a2088815ae32f96beb87fd93ffb3a9..841cfabf99d188903659bff9ec191bf778666282 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -4682,7 +4682,8 @@ void Objecter::blacklist_self(bool set)
   else
     cmd.push_back("\"blacklistop\":\"rm\",");
   stringstream ss;
-  ss << messenger->get_myaddr();
+  // this is somewhat imprecise in that we are blacklisting our first addr only
+  ss << messenger->get_myaddrs().front().get_legacy_str();
   cmd.push_back("\"addr\":\"" + ss.str() + "\"");
 
   MMonCommand *m = new MMonCommand(monc->get_fsid());

diff --git a/src/test/direct_messenger/DirectMessenger.cc b/src/test/direct_messenger/DirectMessenger.cc
index ea6439e18d3f02a60e50c4ce31d674b9dc40ee1f..076f5fc39a61c3f3bcbbea8c01c613607b09b995 100644 (file)
--- a/src/test/direct_messenger/DirectMessenger.cc
+++ b/src/test/direct_messenger/DirectMessenger.cc
@@ -235,7 +235,7 @@ void DirectMessenger::mark_down(const entity_addr_t& addr)
   ConnectionRef conn;
   if (addr == peer_inst.addr) {
     conn = peer_connection;
-  } else if (addr == get_myaddr()) {
+  } else if (addr == get_myaddr_legacy()) {
     conn = loopback_connection;
   }
   if (conn) {

diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc
index 5585b831258f0c4f0b0787fec7a4b69e57d20c92..9c95086af8477e43a6ad28f19ae54cafd47209be 100644 (file)
--- a/src/test/mon/test-mon-msg.cc
+++ b/src/test/mon/test-mon-msg.cc
@@ -86,7 +86,7 @@ public:
     ceph_assert(msg != NULL);
     msg->set_default_policy(Messenger::Policy::lossy_client(0));
     dout(0) << __func__ << " starting messenger at "
-            << msg->get_myaddr() << dendl;
+            << msg->get_myaddrs() << dendl;
     msg->start();
     return 0;
   }

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index 7cd8432daaf37873b99fe5ce224281c648cfdc05..937615c8e34a91e71512cf5d7be1899304091fc9 100644 (file)
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -258,7 +258,7 @@ class ClientStub : public TestStub
     messenger->set_default_policy(
        Messenger::Policy::lossy_client(CEPH_FEATURE_OSDREPLYMUX));
     dout(10) << "ClientStub::" << __func__ << " starting messenger at "
-           << messenger->get_myaddr() << dendl;
+           << messenger->get_myaddrs() << dendl;
 
     objecter.reset(new Objecter(cct, messenger.get(), &monc, NULL, 0, 0));
     ceph_assert(objecter.get() != NULL);
@@ -707,7 +707,7 @@ class OSDStub : public TestStub
     for (; num_entries > 0; --num_entries) {
       LogEntry e;
       e.rank = messenger->get_myname();
-      e.addrs.v.push_back(messenger->get_myaddr());
+      e.addrs = messenger->get_myaddrs();
       e.stamp = now;
       e.seq = seq++;
       e.prio = CLOG_DEBUG;