From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 30 Mar 2016 09:24:08 +0000 (+0800)
Subject: osd: skip heartbeat_check for osd which we haven't sent ping to
X-Git-Tag: v10.1.1~46^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c29895949eafe7b4f2ff5004aca5c39eb44634c6;p=ceph.git

osd: skip heartbeat_check for osd which we haven't sent ping to

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 823f4170d8adc..d14fccb1837be 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4027,6 +4027,13 @@ void OSD::heartbeat_check()
   for (map<int,HeartbeatInfo>::iterator p = heartbeat_peers.begin();
        p != heartbeat_peers.end();
        ++p) {
+
+    if (p->second.first_tx == utime_t()) {
+      dout(25) << "heartbeat_check we haven't sent ping to osd." << p->first
+               << "yet, skipping" << dendl;
+      continue;
+    }
+
     dout(25) << "heartbeat_check osd." << p->first
 	     << " first_tx " << p->second.first_tx
 	     << " last_tx " << p->second.last_tx