From 2748383b1a4b557d197f77bc769601a47701d2fa Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.systems>
Date: Sat, 2 Jun 2018 14:14:45 +0200
Subject: [PATCH] F #2147: Reset election timeout on turning into follower

(cherry picked from commit 49ae0268769ee0b9a8cb42b5b0df95e9976338f6)
---
 src/raft/RaftManager.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/raft/RaftManager.cc b/src/raft/RaftManager.cc
index 108d1d1e10..28cab7b9fd 100644
--- a/src/raft/RaftManager.cc
+++ b/src/raft/RaftManager.cc
@@ -562,6 +562,12 @@ void RaftManager::follower(unsigned int _term)
 
     requests.clear();
 
+    //Reset heartbeat when turning into follower when a higher term is found:
+    // 1. On vote request
+    // 2. On heartbeat response
+    // 3. On log replicate request
+	clock_gettime(CLOCK_REALTIME, &last_heartbeat);
+
     pthread_mutex_unlock(&mutex);
 
     if ( nd.is_federation_master() )