From 9979f947f25e231eaa564f677612830702cebedc Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 5 Apr 2023 20:46:26 -0400 Subject: [PATCH] mon/MDSMonitor: force immediate propose when evicting an MDS Signed-off-by: Patrick Donnelly (cherry picked from commit 05d60f05bff9bf08c8336eebfd96af0bc7831100) --- src/mon/MDSMonitor.cc | 3 +++ 1 file changed, 3 insertions(+) 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("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); -- 2.39.5