From: Sage Weil <sage@redhat.com>
Date: Wed, 30 May 2018 20:09:22 +0000 (-0500)
Subject: mgr: avoid OSDMap::get_addr()
X-Git-Tag: v14.0.1~1208^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c11183d4ee3397c906629e7d3e441d3eecaf02e5;p=ceph-ci.git

mgr: avoid OSDMap::get_addr()

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 3dfdcec8ca6..2acebb4d8c3 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -413,11 +413,11 @@ void Mgr::handle_osd_map()
         auto addr_iter = metadata->metadata.find("front_addr");
         if (addr_iter != metadata->metadata.end()) {
           const std::string &metadata_addr = addr_iter->second;
-          const auto &map_addr = osd_map.get_addr(osd_id);
+          const auto &map_addrs = osd_map.get_addrs(osd_id);
 
-          if (metadata_addr != stringify(map_addr)) {
+          if (metadata_addr != stringify(map_addrs)) {
             dout(4) << "OSD[" << osd_id << "] addr change " << metadata_addr
-                    << " != " << stringify(map_addr) << dendl;
+                    << " != " << stringify(map_addrs) << dendl;
             update_meta = true;
           } else {
             dout(20) << "OSD[" << osd_id << "] addr unchanged: "