From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 8 Jan 2018 02:24:09 +0000 (+0800)
Subject: osd/OSD: use first_tx to calculate failed_for
X-Git-Tag: v13.2.7~26^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f72f8fefe92b4c9894f4191f37819f80832a078e;p=ceph.git

osd/OSD: use first_tx to calculate failed_for

If we never hear any replies from a heartbeat peer, use first_tx
to calculdate failed_for, which is more accurate.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit aba603736cbce94f7e1e5ac851ae4d4f43ea63e6)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 690252eb41c6..7dd8981d2a5d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4758,7 +4758,7 @@ void OSD::heartbeat_check()
              << " (oldest deadline " << oldest_deadline << ")"
              << dendl;
 	// fail
-	failure_queue[p->first] = p->second.last_tx;
+	failure_queue[p->first] = p->second.first_tx;
       } else {
 	derr << "heartbeat_check: no reply from "
              << p->second.con_front->get_peer_addr().get_sockaddr()