From: Kamoltat Date: Tue, 13 Dec 2022 14:29:12 +0000 (+0000) Subject: Revert "mon/OSDMonitor: Added extra check before mon.go_recovery_stretch_mode()" X-Git-Tag: v16.2.11~49^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efe00718e87634b6e56d4d7c176e5c3e5547aded;p=ceph.git Revert "mon/OSDMonitor: Added extra check before mon.go_recovery_stretch_mode()" This commit belongs to https://github.com/ceph/ceph/pull/48803 which introduced https://tracker.ceph.com/issues/58239. Therefore, we are reverting it. This reverts commit 94dc97005bf6406d13c3fd5a3664a1fe2f7efec9. Fixes: https://tracker.ceph.com/issues/58239 Signed-off-by: Kamoltat --- diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index b88813e8af55..97034994546a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -960,12 +960,10 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap) dout(20) << "mon_stretch_cluster_recovery_ratio: " << cct->_conf.get_val("mon_stretch_cluster_recovery_ratio") << dendl; if (prev_num_up_osd < osdmap.num_up_osd && (osdmap.num_up_osd / (double)osdmap.num_osd) > - cct->_conf.get_val("mon_stretch_cluster_recovery_ratio") && - mon.dead_mon_buckets.size() == 0) { + cct->_conf.get_val("mon_stretch_cluster_recovery_ratio")) { // TODO: This works for 2-site clusters when the OSD maps are appropriately // trimmed and everything is "normal" but not if you have a lot of out OSDs // you're ignoring or in some really degenerate failure cases - dout(10) << "Enabling recovery stretch mode in this map" << dendl; mon.go_recovery_stretch_mode(); }