Skip to content

Commit

Permalink
Merge pull request #12130 from liupan1111/wip-osd-hearteat
Browse files Browse the repository at this point in the history
osd: remove redudant call of heartbeat_check

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
  • Loading branch information
liewegas committed Nov 29, 2016
2 parents d559602 + ed583d3 commit b42dfca
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/osd/OSD.cc
Expand Up @@ -4208,7 +4208,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();
Expand Down Expand Up @@ -4295,9 +4295,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?
Expand Down

0 comments on commit b42dfca

Please sign in to comment.