mon: use MonMap::get_addrs() (instead of get_addr())

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

diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc
index 93d209c4a5563aef2d74df55b34dd7ac6df24905..e255b16e2f109f9779092e0f4d8b4a165fd091ff 100644 (file)
--- a/src/mon/HealthMonitor.cc
+++ b/src/mon/HealthMonitor.cc
@@ -326,7 +326,7 @@ bool HealthMonitor::check_leader_health()
        if (q.count(i) == 0) {
          ostringstream ss;
          ss << "mon." << mon->monmap->get_name(i) << " (rank " << i
-            << ") addr " << mon->monmap->get_addr(i)
+            << ") addr " << mon->monmap->get_addrs(i)
             << " is down (out of quorum)";
          d.detail.push_back(ss.str());
        }

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 33f296d3428aa7908291041954cd5b1dbbde5edf..08318e89ae891d16cf7b47d697d69345389c2ae8 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1816,8 +1816,9 @@ void Monitor::handle_probe_reply(MonOpRequestRef op)
   // new initial peer?
   if (monmap->get_epoch() == 0 &&
       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->get_addrs(m->name).front().is_blank_ip()) {
+    dout(1) << " learned initial mon " << m->name
+           << " addrs " << m->get_source_addrs() << dendl;
     monmap->set_addrvec(m->name, m->get_source_addrs());
 
     bootstrap();
@@ -1893,7 +1894,7 @@ void Monitor::handle_probe_reply(MonOpRequestRef op)
              << dendl;
 
     if (monmap->contains(name) &&
-        !monmap->get_addr(name).is_blank_ip()) {
+        !monmap->get_addrs(name).front().is_blank_ip()) {
       // i'm part of the cluster; just initiate a new election
       start_election();
     } else {

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 43f373cdec141f9894656c42185cf6e912671084..97e36e4914590e1f84a57de66eb0fb755b5d2a20 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -640,10 +640,10 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
      * introduced.
      */
 
-    entity_addr_t addr = pending_map.get_addr(name);
+    entity_addrvec_t addrs = pending_map.get_addrs(name);
     pending_map.remove(name);
     pending_map.last_changed = ceph_clock_now();
-    ss << "removing mon." << name << " at " << addr
+    ss << "removing mon." << name << " at " << addrs
        << ", there will be " << pending_map.size() << " monitors" ;
     propose = true;
     err = 0;
@@ -757,7 +757,7 @@ bool MonmapMonitor::preprocess_join(MonOpRequestRef op)
   }
 
   if (pending_map.contains(join->name) &&
-      !pending_map.get_addr(join->name).is_blank_ip()) {
+      !pending_map.get_addrs(join->name).front().is_blank_ip()) {
     dout(10) << " already have " << join->name << dendl;
     return true;
   }