Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always notify term change on RequestVote. #2223

Merged
merged 1 commit into from
Apr 9, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions raft/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -1611,22 +1611,26 @@ func (l *Log) RequestVote(term, candidateID, lastLogIndex, lastLogTerm uint64) (
return l.term, ErrStaleTerm
} else if term == l.term && l.votedFor != 0 && l.votedFor != candidateID {
return l.term, ErrAlreadyVoted
} else if lastLogTerm < l.lastLogTerm {
return l.term, ErrOutOfDateLog
} else if lastLogTerm == l.lastLogTerm && lastLogIndex < l.lastLogIndex {
return l.term, ErrOutOfDateLog
}

// Notify term change.
l.term = term
l.votedFor = 0
if term > l.term {
select {
case l.terms <- term:
default:
}
}

// Vote for candidate & increase term.
l.term = term
// Reject request if log is out of date.
if lastLogTerm < l.lastLogTerm {
return l.term, ErrOutOfDateLog
} else if lastLogTerm == l.lastLogTerm && lastLogIndex < l.lastLogIndex {
return l.term, ErrOutOfDateLog
}

// Vote for candidate.
l.votedFor = candidateID

return l.term, nil
Expand Down