From: Pan Liu <pan.liu@istuary.com>
Date: Thu, 24 Nov 2016 01:43:42 +0000 (+0800)
Subject: OSD: remove redudant call of heartbeat_check. Heartbeat_check is already called in... 
X-Git-Tag: v11.1.0~126^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12130%2Fhead;p=ceph.git

OSD: remove redudant call of heartbeat_check. Heartbeat_check is already called in tick_without_osd_lock.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2cde841e4368c..7986d1b537a14 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4209,7 +4209,7 @@ void OSD::heartbeat_check()
   assert(heartbeat_lock.is_locked());
   utime_t now = ceph_clock_now(cct);
 
-  // check for incoming heartbeats (move me elsewhere?)
+  // check for heartbeat replies (move me elsewhere?)
   utime_t cutoff = now;
   cutoff -= cct->_conf->osd_heartbeat_grace;
   for (map<int,HeartbeatInfo>::iterator p = heartbeat_peers.begin();
@@ -4296,9 +4296,6 @@ void OSD::heartbeat()
 						     now));
   }
 
-  dout(30) << "heartbeat check" << dendl;
-  heartbeat_check();
-
   logger->set(l_osd_hb_to, heartbeat_peers.size());
 
   // hmm.. am i all alone?