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 638612df8839967a2a0585b436b56c56ea8c929c..53a2dfbdf14ef2d26a814e9824f16f9726fb7633 100644 (file)
--- 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);