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 <ksirivad@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b88813e8af5558ed343d1ab48b36d4c3c4bec20b..97034994546a630c75f06ab8cc98a1b7ac4f14bc 100644 (file)
--- 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<double>("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<double>("mon_stretch_cluster_recovery_ratio") &&
-      mon.dead_mon_buckets.size() == 0) {
+           cct->_conf.get_val<double>("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();
        }