mon/MonMap: fix set_addr() caller, kill wrapper

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

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index f1c76c7a36690e57d2520011b829eafa008045ba..75d776c97c1e747599ae4814cd0a8f8e6ce78517 100644 (file)
--- 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);
-  }
   // </REMOVE ME>
 
   const entity_addrvec_t& get_addrs(const string& n) const {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index f58d2fc356e3cd7eb79f406b1f2fa3f2616b5236..33f296d3428aa7908291041954cd5b1dbbde5edf 100644 (file)
--- 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;