tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in leader election (missing HB)

Browse Source 
Reviewers: msantl

Reviewed By: msantl

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1767
This commit is contained in:
Ivan Paljak 2018-12-11 14:12:24 +01:00
parent 8e35d8afdc
commit 00506b9962
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/raft/raft_server.cpp
View File

@ -272,17 +272,19 @@ void RaftServer::Transition(const Mode &new_mode) {
if (mode_ == Mode::LEADER) { if (mode_ == Mode::LEADER) {
reset_callback_(); reset_callback_();
} }
LOG(INFO) << "Server " << server_id_ << ": Transition to FOLLOWER"; LOG(INFO) << "Server " << server_id_
<< ": Transition to FOLLOWER (Term: " << CurrentTerm() << ")";
mode_ = Mode::FOLLOWER; mode_ = Mode::FOLLOWER;
// log_entry_buffer_.Disable(); log_entry_buffer_.Disable();
SetNextElectionTimePoint(); SetNextElectionTimePoint();
election_change_.notify_all(); election_change_.notify_all();
break; break;
} }
case Mode::CANDIDATE: { case Mode::CANDIDATE: {
LOG(INFO) << "Server " << server_id_ << ": Transition to CANDIDATE"; LOG(INFO) << "Server " << server_id_
// log_entry_buffer_.Disable(); << ": Transition to CANDIDATE (Term: " << CurrentTerm() << ")";
log_entry_buffer_.Disable();
// [Raft thesis, section 3.4] // [Raft thesis, section 3.4]
// "Each candidate restarts its randomized election timeout at the start // "Each candidate restarts its randomized election timeout at the start
@ -315,8 +317,9 @@ void RaftServer::Transition(const Mode &new_mode) {
} }
case Mode::LEADER: { case Mode::LEADER: {
LOG(INFO) << "Server " << server_id_ << ": Transition to LEADER"; LOG(INFO) << "Server " << server_id_
// log_entry_buffer_.Enable(); << ": Transition to LEADER (Term: " << CurrentTerm() << ")";
log_entry_buffer_.Enable();
// Freeze election timer // Freeze election timer
next_election_ = TimePoint::max(); next_election_ = TimePoint::max();
@ -349,7 +352,9 @@ void RaftServer::ElectionThreadMain() {
std::unique_lock<std::mutex> lock(lock_); std::unique_lock<std::mutex> lock(lock_);
while (!exiting_) { while (!exiting_) {
if (Clock::now() >= next_election_) { if (Clock::now() >= next_election_) {
LOG(INFO) << "Server " << server_id_ << ": Election timeout exceeded"; LOG(INFO) << "Server " << server_id_
<< ": Election timeout exceeded (Term: " << CurrentTerm()
<< ")";
Transition(Mode::CANDIDATE); Transition(Mode::CANDIDATE);
state_changed_.notify_all(); state_changed_.notify_all();
} }
@ -439,7 +444,7 @@ void RaftServer::PeerThreadMain(int peer_id) {
case Mode::LEADER: { case Mode::LEADER: {
if (now >= next_heartbeat_[peer_id]) { if (now >= next_heartbeat_[peer_id]) {
LOG(INFO) << "Server " << server_id_ << ": Send HB to server " LOG(INFO) << "Server " << server_id_ << ": Send HB to server "
<< peer_id; << peer_id << " (Term: " << CurrentTerm() << ")";
auto peer_future = coordination_->ExecuteOnWorker<AppendEntriesRes>( auto peer_future = coordination_->ExecuteOnWorker<AppendEntriesRes>(
peer_id, [&](int worker_id, auto &client) { peer_id, [&](int worker_id, auto &client) {
auto last_entry_data = LastEntryData(); auto last_entry_data = LastEntryData();
@ -480,7 +485,8 @@ void RaftServer::SetNextElectionTimePoint() {
bool RaftServer::HasMajortyVote() { bool RaftServer::HasMajortyVote() {
if (2 * granted_votes_ > coordination_->WorkerCount()) { if (2 * granted_votes_ > coordination_->WorkerCount()) {
LOG(INFO) << "Server " << server_id_ << ": Obtained majority vote"; LOG(INFO) << "Server " << server_id_
<< ": Obtained majority vote (Term: " << CurrentTerm() << ")";
return true; return true;
} }
return false; return false;