mon/OSDMonitor: new osd timeout handling is unconditional

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b73eb5900f788337cc73879617a3ef101c9eb085..106d2826f577a704e719e0e183f76d30d486d27f 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3301,12 +3301,8 @@ void OSDMonitor::tick()
   bool do_propose = false;
   utime_t now = ceph_clock_now();
 
-  if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
-      mon->monmap->get_required_features().contains_all(
-       ceph::features::mon::FEATURE_LUMINOUS)) {
-    if (handle_osd_timeouts(now, last_osd_report)) {
-      do_propose = true;
-    }
+  if (handle_osd_timeouts(now, last_osd_report)) {
+    do_propose = true;
   }
 
   // mark osds down?