osd: tick at OSD_TICK_INTERVAL, not heartbeat interval

Heartbeat inveral is not related!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7d76458354661f7575c4a2cae251a9b828513580)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 810e8583b73e8785b0812240b0b0cbbe235a8d40..a3ec4b6eb2f10a0f861bd8068b0803b6100549e8 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2680,10 +2680,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();
@@ -5423,7 +5425,8 @@ void OSD::tick_without_osd_lock()
 
   mgrc.update_osd_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));
 }
 
 void OSD::check_ops_in_flight()