From eb4ae9e21cc6e7474e11423a4f523ebb5c75407b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Sep 2017 15:00:34 -0400 Subject: [PATCH] mon/OSDMonitor: new osd timeout handling is unconditional Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index b73eb5900f788..106d2826f577a 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? -- 2.39.5