From b62520059767bbae2bd24d4edbedf3aa22eeea4c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 15 Feb 2019 23:11:07 +0800 Subject: [PATCH] mon/MonClient: drop my_addr the only consumer of this member variable is MgrStandby, and MgrStandby does have access to the messenger. so let it get the IP address directly. Signed-off-by: Kefu Chai --- src/mgr/MgrStandby.cc | 3 ++- src/mon/MonClient.cc | 4 ---- src/mon/MonClient.h | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index f055ce288379..a2767be7abda 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -216,7 +216,8 @@ void MgrStandby::send_beacon() dout(10) << "sending beacon as gid " << monc.get_global_id() << dendl; map metadata; - metadata["addr"] = monc.get_my_addr().ip_only_to_str(); +#warning fixme, report addrs instead + metadata["addr"] = client_messenger->get_myaddr_legacy().ip_only_to_str(); collect_sys_info(&metadata, g_ceph_context); MMgrBeacon *m = new MMgrBeacon(monc.get_fsid(), diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index a739e7166478..e366805a9fb7 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -271,10 +271,6 @@ 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_legacy(); - // we only care about these message types switch (m->get_type()) { case CEPH_MSG_MON_MAP: diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index ee1e9bb20a1c..c5e65983d364 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -246,8 +246,6 @@ private: EntityName entity_name; - entity_addr_t my_addr; - mutable Mutex monc_lock; SafeTimer timer; Finisher finisher; @@ -467,10 +465,6 @@ public: _reopen_session(); } - entity_addr_t get_my_addr() const { - return my_addr; - } - const uuid_d& get_fsid() const { return monmap.fsid; } -- 2.47.3