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

Fix failed assertion in HA snapshot recovery

Browse Source 
Reviewers: mferencevic

Reviewed By: mferencevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2345
This commit is contained in:
Ivan Paljak 2019-09-02 16:42:40 +02:00
parent 726ae5da6a
commit 1dccf02e1b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/raft/raft_server.cpp
View File

@ -205,7 +205,10 @@ void RaftServer::Start() {
} }
} }
AppendLogEntries(req.leader_commit, req.prev_log_index + 1, req.entries); // No need to call this function for a heartbeat
if (!req.entries.empty()) {
AppendLogEntries(req.leader_commit, req.prev_log_index + 1, req.entries);
}
// [Raft paper 5.3] // [Raft paper 5.3]
// "Once a follower learns that a log entry is committed, it applies // "Once a follower learns that a log entry is committed, it applies
@ -1284,6 +1287,7 @@ void RaftServer::AppendLogEntries(uint64_t leader_commit_index,
log_[log_size_] = new_entries[i]; log_[log_size_] = new_entries[i];
disk_storage_.Put(LogEntryKey(log_size_), disk_storage_.Put(LogEntryKey(log_size_),
SerializeLogEntry(new_entries[i])); SerializeLogEntry(new_entries[i]));
last_entry_term_ = new_entries[i].term;
SetLogSize(log_size_ + 1); SetLogSize(log_size_ + 1);
} }
} }
@ -1292,8 +1296,6 @@ void RaftServer::AppendLogEntries(uint64_t leader_commit_index,
if (leader_commit_index > commit_index_) { if (leader_commit_index > commit_index_) {
commit_index_ = std::min(leader_commit_index, log_size_ - 1); commit_index_ = std::min(leader_commit_index, log_size_ - 1);
} }
last_entry_term_ = GetLogEntry(log_size_ - 1).term;
} }
std::string RaftServer::LogEntryKey(uint64_t index) { std::string RaftServer::LogEntryKey(uint64_t index) {