From 8e251c5827e5d0cce1a2edcaee98489fa1b5cdae Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 15 Jul 2018 20:49:38 -0500 Subject: [PATCH] mon: use MonMap::get_addrs() (instead of get_addr()) Signed-off-by: Sage Weil --- src/mon/HealthMonitor.cc | 2 +- src/mon/Monitor.cc | 7 ++++--- src/mon/MonmapMonitor.cc | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index 93d209c4a55..e255b16e2f1 100644 --- 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 33f296d3428..08318e89ae8 100644 --- 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 43f373cdec1..97e36e49145 100644 --- 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; } -- 2.39.5