mon/MDSMonitor: force immediate propose when evicting an MDS

batrick · batrick · commit 05d60f05bff9 · 2023-05-30T12:33:11.000-04:00
Signed-off-by: Patrick Donnelly &lt;pdonnell@redhat.com&gt;
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
@@ -804,6 +804,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);
 
@@ -1277,6 +1278,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);

Original file line number	Diff line number	Diff line change
`@@ -804,6 +804,7 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)`
`804`	`804`	`last_beacon.erase(followergid);`
`805`	`805`	`}`
`806`	`806`	`request_proposal(mon.osdmon());`
	`807`	`+ force_immediate_propose();`
`807`	`808`	`pending.damaged(rankgid, blocklist_epoch);`
`808`	`809`	`last_beacon.erase(rankgid);`
`809`	`810`
`@@ -1277,6 +1278,8 @@ bool MDSMonitor::fail_mds_gid(FSMap &fsmap, mds_gid_t gid)`
`1277`	`1278`	`utime_t until = ceph_clock_now();`
`1278`	`1279`	`until += g_conf().get_val<double>("mon_mds_blocklist_interval");`
`1279`	`1280`	`blocklist_epoch = mon.osdmon()->blocklist(info.addrs, until);`
	`1281`	`+ /* do not delay when we are evicting an MDS */`
	`1282`	`+ force_immediate_propose();`
`1280`	`1283`	`}`
`1281`	`1284`
`1282`	`1285`	`fsmap.erase(gid, blocklist_epoch);`