From 7d76458354661f7575c4a2cae251a9b828513580 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 9 Aug 2018 08:22:05 -0500 Subject: [PATCH] osd: tick at OSD_TICK_INTERVAL, not heartbeat interval Heartbeat inveral is not related! Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 86e06dd5619..db51ad153a3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2606,10 +2606,12 @@ int OSD::init() heartbeat_thread.create("osd_srv_heartbt"); // tick - tick_timer.add_event_after(cct->_conf->osd_heartbeat_interval, new C_Tick(this)); + tick_timer.add_event_after(OSD_TICK_INTERVAL, + new C_Tick(this)); { Mutex::Locker l(tick_timer_lock); - tick_timer_without_osd_lock.add_event_after(cct->_conf->osd_heartbeat_interval, new C_Tick_WithoutOSDLock(this)); + tick_timer_without_osd_lock.add_event_after(OSD_TICK_INTERVAL, + new C_Tick_WithoutOSDLock(this)); } osd_lock.Unlock(); @@ -4875,7 +4877,8 @@ void OSD::tick_without_osd_lock() mgrc.update_daemon_health(get_health_metrics()); service.kick_recovery_queue(); - tick_timer_without_osd_lock.add_event_after(OSD_TICK_INTERVAL, new C_Tick_WithoutOSDLock(this)); + tick_timer_without_osd_lock.add_event_after(OSD_TICK_INTERVAL, + new C_Tick_WithoutOSDLock(this)); } // Usage: -- 2.39.5