From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 30 Sep 2021 19:05:25 +0000 (+0000)
Subject: mon: remove deleted monitors from the disallowed_leaders set
X-Git-Tag: v17.1.0~738^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6123f3a44af6b3d1fc9b46546e93b7f261c2a381;p=ceph.git

mon: remove deleted monitors from the disallowed_leaders set

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 66bce6d0ab77e..bbeb66d8914cd 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -751,6 +751,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
 
     entity_addrvec_t addrs = pending_map.get_addrs(name);
     pending_map.remove(name);
+    pending_map.disallowed_leaders.erase(name);
     pending_map.last_changed = ceph_clock_now();
     ss << "removing mon." << name << " at " << addrs
        << ", there will be " << pending_map.size() << " monitors" ;