From a21b39f9f7c5875bab2aff818aa434aaf079db93 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 13 Oct 2017 17:25:13 +0200 Subject: [PATCH] B #5432: Execute timer action for SOLO oned's, this clean federation log in non-HA configurations (cherry picked from commit 577d976d14fa689bbc0cc15ca8d6dbb0eb01588d) --- src/raft/RaftManager.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/raft/RaftManager.cc b/src/raft/RaftManager.cc index 1d07a30ff2..5dc5b83fa0 100644 --- a/src/raft/RaftManager.cc +++ b/src/raft/RaftManager.cc @@ -212,16 +212,7 @@ extern "C" void * raft_manager_loop(void *arg) NebulaLog::log("RCM",Log::INFO,"Raft Consensus Manager started."); - if ( raftm->is_solo() ) - { - raftm->am.loop(); - - } - else - { - raftm->am.loop(timeout); - } - + raftm->am.loop(timeout); NebulaLog::log("RCM",Log::INFO,"Raft Consensus Manager stopped."); @@ -816,7 +807,7 @@ void RaftManager::timer_action(const ActionRequest& ar) pthread_mutex_unlock(&mutex); } } - else + else //SOLO or CANDIDATE, do nothing { pthread_mutex_unlock(&mutex); }