From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 6 Apr 2023 00:46:26 +0000 (-0400)
Subject: mon/MDSMonitor: force immediate propose when evicting an MDS
X-Git-Tag: v18.2.1~269^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9979f947f25e231eaa564f677612830702cebedc;p=ceph-ci.git

mon/MDSMonitor: force immediate propose when evicting an MDS

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 05d60f05bff9bf08c8336eebfd96af0bc7831100)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 638612df883..53a2dfbdf14 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -797,6 +797,7 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
         last_beacon.erase(followergid);
       }
       request_proposal(mon.osdmon());
+      force_immediate_propose();
       pending.damaged(rankgid, blocklist_epoch);
       last_beacon.erase(rankgid);
 
@@ -1268,6 +1269,8 @@ bool MDSMonitor::fail_mds_gid(FSMap &fsmap, mds_gid_t gid)
     utime_t until = ceph_clock_now();
     until += g_conf().get_val<double>("mon_mds_blocklist_interval");
     blocklist_epoch = mon.osdmon()->blocklist(info.addrs, until);
+    /* do not delay when we are evicting an MDS */
+    force_immediate_propose();
   }
 
   fsmap.erase(gid, blocklist_epoch);