From: Joao Eduardo Luis <joao@suse.de>
Date: Tue, 15 Dec 2015 09:20:48 +0000 (+0000)
Subject: krbd.cc: don't rely on MonMap internal members
X-Git-Tag: v11.1.0~400^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2ee1b9a4084f1613f3d28a06744c0866278ab7d6;p=ceph-ci.git

krbd.cc: don't rely on MonMap internal members

Use the public interface instead. That's stable and not as prone to
change.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/krbd.cc b/src/krbd.cc
index f1827f75901..29546156298 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -118,12 +118,14 @@ static int build_map_buf(CephContext *cct, const char *pool, const char *image,
   if (r < 0)
     return r;
 
-  for (map<string, entity_addr_t>::const_iterator it = monmap.mon_addr.begin();
-       it != monmap.mon_addr.end();
-       ++it) {
-    if (it != monmap.mon_addr.begin())
+  list<entity_addr_t> mon_addr;
+  monmap.list_addrs(mon_addr);
+
+  for (const auto &p : mon_addr) {
+    if (oss.tellp() > 0) {
       oss << ",";
-    oss << it->second.get_sockaddr();
+    }
+    oss << p;
   }
 
   oss << " name=" << cct->_conf->name.get_id();