From ec8cc63910a9185be70abd680b86b80983db035f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 3 Feb 2019 13:48:21 -0600 Subject: [PATCH] remove all Messenger::get_myaddr() users Use get_myaddrs() instead and join the glorious future. Signed-off-by: Sage Weil --- src/client/Client.cc | 4 ++-- src/mon/MonClient.cc | 3 ++- src/mon/Monitor.cc | 6 +++--- src/msg/Messenger.h | 3 --- src/msg/async/AsyncConnection.cc | 4 ++-- src/msg/simple/Accepter.cc | 6 +++--- src/msg/simple/Pipe.cc | 7 ++++--- src/msg/simple/SimpleMessenger.cc | 6 +++--- src/msg/xio/XioMessenger.cc | 2 +- src/msg/xio/XioMsg.h | 2 +- src/osdc/Objecter.cc | 3 ++- src/test/direct_messenger/DirectMessenger.cc | 2 +- src/test/mon/test-mon-msg.cc | 2 +- src/test/mon/test_mon_workloadgen.cc | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 58ffd36d66f54..4cb8f4e23d3ef 100644 --- 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 d628e819d9f65..02ab387ccf0f4 100644 --- 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 bbc13f9dc4a57..b1f1f6a7dafd0 100644 --- 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(); - 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 c0614b00ddb15..21dfe0bb969aa 100644 --- 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 1ed18db114d66..92b0df9cfb763 100644 --- 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 e647594079afb..52f3df2bcc02e 100644 --- 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& 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& 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 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 44886ce361c41..8f5d45763c0c7 100644 --- 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 1252e784449d4..2c92fb04a3361 100644 --- 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 722ac6dbd237c..dec7d0c70ac8d 100644 --- 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 b21e1835c36a3..99968fd9fb893 100644 --- 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 14778672d1a20..841cfabf99d18 100644 --- 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 ea6439e18d3f0..076f5fc39a61c 100644 --- 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 5585b831258f0..9c95086af8477 100644 --- 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 7cd8432daaf37..937615c8e34a9 100644 --- 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; -- 2.39.5