]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: use first_tx to calculate failed_for
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 8 Jan 2018 02:24:09 +0000 (10:24 +0800)
committerDavid Zafman <dzafman@redhat.com>
Fri, 18 Oct 2019 17:44:33 +0000 (10:44 -0700)
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)

src/osd/OSD.cc

index 690252eb41c64a8a758d36ebd1f21bd67e908854..7dd8981d2a5d85e7679bd07af8a7abc00ba22d63 100644 (file)
@@ -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()