From 8cc65291a9d29c9c0ea7ae332cbdd1892240d2f8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Jun 2018 11:21:03 -0500 Subject: [PATCH] client: myaddr -> myaddrs Signed-off-by: Sage Weil --- src/client/Client.cc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 61ba77eddf9..4fdf276b2d3 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -2417,8 +2417,17 @@ void Client::handle_osd_map(MOSDMap *m) std::set new_blacklists; objecter->consume_blacklist_events(&new_blacklists); - const auto myaddr = messenger->get_myaddr(); - if (!blacklisted && new_blacklists.count(myaddr)) { + const auto myaddrs = messenger->get_myaddrs(); + bool new_blacklist = false; + if (!blacklisted) { + for (auto& a : myaddrs.v) { + if (new_blacklists.count(a)) { + new_blacklist = true; + break; + } + } + } + if (new_blacklist) { auto epoch = objecter->with_osdmap([](const OSDMap &o){ return o.get_epoch(); }); @@ -2455,8 +2464,8 @@ void Client::handle_osd_map(MOSDMap *m) } else if (blacklisted) { // Handle case where we were blacklisted but no longer are - blacklisted = objecter->with_osdmap([myaddr](const OSDMap &o){ - return o.is_blacklisted(myaddr);}); + blacklisted = objecter->with_osdmap([myaddrs](const OSDMap &o){ + return o.is_blacklisted(myaddrs);}); } if (objecter->osdmap_full_flag()) { @@ -13520,7 +13529,7 @@ int Client::get_local_osd() objecter->with_osdmap([this](const OSDMap& o) { if (o.get_epoch() != local_osd_epoch) { - local_osd = o.find_osd_on_ip(messenger->get_myaddr()); + local_osd = o.find_osd_on_ip(messenger->get_myaddrs().front()); local_osd_epoch = o.get_epoch(); } }); -- 2.39.5