From f926f13793b18c8ad1a77acbcba8bff3197aa932 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 13 Jul 2018 14:48:43 -0500 Subject: [PATCH] mon/MonMap: fix set_addr() caller, kill wrapper Signed-off-by: Sage Weil --- src/mon/MonMap.h | 4 ---- src/mon/Monitor.cc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index f1c76c7a366..75d776c97c1 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -346,10 +346,6 @@ public: entity_addr_t get_addr(unsigned m) const { return get_addrs(m).legacy_addr(); } - void set_addr(const string& n, const entity_addr_t& a) { - ceph_assert(mon_info.count(n)); - mon_info[n].public_addrs = entity_addrvec_t(a); - } // const entity_addrvec_t& get_addrs(const string& n) const { diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index f58d2fc356e..33f296d3428 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1818,7 +1818,7 @@ void Monitor::handle_probe_reply(MonOpRequestRef op) monmap->contains(m->name) && monmap->get_addr(m->name).is_blank_ip()) { dout(1) << " learned initial mon " << m->name << " addr " << m->get_source_addr() << dendl; - monmap->set_addr(m->name, m->get_source_addr()); + monmap->set_addrvec(m->name, m->get_source_addrs()); bootstrap(); return; -- 2.39.5