From: John Spray <john.spray@redhat.com>
Date: Thu, 16 Feb 2017 17:20:48 +0000 (+0000)
Subject: osd/OSDMap: std::set version of get_blacklist
X-Git-Tag: v12.1.0~10^2~27^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe56a74cd2ec02137bfdf506b2dbbcefb9620030;p=ceph.git

osd/OSDMap: std::set version of get_blacklist

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index fbfcd5a5b409..32aeb4870d89 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1017,6 +1017,13 @@ void OSDMap::get_blacklist(list<pair<entity_addr_t,utime_t> > *bl) const
    std::copy(blacklist.begin(), blacklist.end(), std::back_inserter(*bl));
 }
 
+void OSDMap::get_blacklist(std::set<entity_addr_t> *bl) const
+{
+  for (const auto &i : blacklist) {
+    bl->insert(i.first);
+  }
+}
+
 void OSDMap::set_max_osd(int m)
 {
   int o = max_osd;
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 74f0b833a2e1..5d1819df3327 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -345,6 +345,7 @@ public:
 
   bool is_blacklisted(const entity_addr_t& a) const;
   void get_blacklist(list<pair<entity_addr_t,utime_t > > *bl) const;
+  void get_blacklist(std::set<entity_addr_t> *bl) const;
 
   string get_cluster_snapshot() const {
     if (cluster_snapshot_epoch == epoch)