From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Sep 2017 19:00:34 +0000 (-0400)
Subject: mon/OSDMonitor: new osd timeout handling is unconditional
X-Git-Tag: v13.0.1~861^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb4ae9e21cc6e7474e11423a4f523ebb5c75407b;p=ceph.git

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 b73eb5900f78..106d2826f577 100644
--- 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?