From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Jun 2018 14:38:44 +0000 (-0500)
Subject: mon/OSDMonitor: addrvec blacklist helper
X-Git-Tag: v14.0.1~951^2~22
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b759c588cb3de05633eb634b75d46336fbff90a9;p=ceph.git

mon/OSDMonitor: addrvec blacklist helper

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 231283189a51f..fc6a3ccd12cb3 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3747,6 +3747,15 @@ int OSDMonitor::get_version_full(version_t ver, uint64_t features,
   return 0;
 }
 
+epoch_t OSDMonitor::blacklist(const entity_addrvec_t& av, utime_t until)
+{
+  dout(10) << "blacklist " << av << " until " << until << dendl;
+  for (auto& a : av.v) {
+    pending_inc.new_blacklist[a] = until;
+  }
+  return pending_inc.epoch;
+}
+
 epoch_t OSDMonitor::blacklist(const entity_addr_t& a, utime_t until)
 {
   dout(10) << "blacklist " << a << " until " << until << dendl;
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 739d4f54fdd53..6bb1218a807a4 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -652,6 +652,7 @@ public:
   int get_inc(version_t ver, OSDMap::Incremental& inc);
   int get_full_from_pinned_map(version_t ver, bufferlist& bl);
 
+  epoch_t blacklist(const entity_addrvec_t& av, utime_t until);
   epoch_t blacklist(const entity_addr_t& a, utime_t until);
 
   void dump_info(Formatter *f);