From fe56a74cd2ec02137bfdf506b2dbbcefb9620030 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 16 Feb 2017 17:20:48 +0000 Subject: [PATCH] osd/OSDMap: std::set version of get_blacklist Signed-off-by: John Spray --- src/osd/OSDMap.cc | 7 +++++++ src/osd/OSDMap.h | 1 + 2 files changed, 8 insertions(+) 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 > *bl) const std::copy(blacklist.begin(), blacklist.end(), std::back_inserter(*bl)); } +void OSDMap::get_blacklist(std::set *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 > *bl) const; + void get_blacklist(std::set *bl) const; string get_cluster_snapshot() const { if (cluster_snapshot_epoch == epoch) -- 2.47.3