From: Sage Weil <sage@redhat.com>
Date: Thu, 9 Aug 2018 13:22:05 +0000 (-0500)
Subject: osd: tick at OSD_TICK_INTERVAL, not heartbeat interval
X-Git-Tag: v12.2.9~8^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8138b1d4f484fc685cb66a9bb85fef23ae65ead4;p=ceph.git

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 810e8583b73e..a3ec4b6eb2f1 100644
--- 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()