From ed583d393376fb1a34466ded4f0349131bd0e278 Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Thu, 24 Nov 2016 09:43:42 +0800 Subject: [PATCH] OSD: remove redudant call of heartbeat_check. Heartbeat_check is already called in tick_without_osd_lock. Signed-off-by: Pan Liu --- src/osd/OSD.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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::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? -- 2.39.5