From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 15 Nov 2021 20:42:35 +0000 (+0000)
Subject: mon: trim range_blocklist alongside the regular one
X-Git-Tag: v16.2.11~103^2~103^2~18
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8994ee2aacbe9429621d2fe84e1ba47457c7b87e;p=ceph.git

mon: trim range_blocklist alongside the regular one

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 4b08448131ff63213f65ac2c2454d53158663ca2)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f57a1925dcd56..4529cbe4d94f5 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -5266,6 +5266,16 @@ void OSDMonitor::tick()
       do_propose = true;
     }
   }
+  for (auto p = osdmap.range_blocklist.begin();
+       p != osdmap.range_blocklist.end();
+       ++p) {
+    if (p->second < now) {
+      dout(10) << "expiring range_blocklist item " << p->first
+	       << " expired " << p->second << " < now " << now << dendl;
+      pending_inc.old_range_blocklist.push_back(p->first);
+      do_propose = true;
+    }
+  }
 
   if (try_prune_purged_snaps()) {
     do_propose = true;