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.

Sign up for GitHub

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

Solution #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Solution #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
147 changes: 102 additions & 45 deletions raft/raft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,33 +107,46 @@ func (raft *Raft) followerSelect() {
return

case rv := <-raft.requestVoteChan:
///////////////////
// MODIFY HERE //
// If term is outdated, update it
if (rv.Term > raft.currentTerm) {
log.Printf("[FOLLOWER] Current term '%v' outdated. Adjusting it to '%v'.", raft.currentTerm, rv.Term)
raft.currentTerm = rv.Term
raft.votedFor = 0
}
reply := &RequestVoteReply{
Term: raft.currentTerm,
}

log.Printf("[FOLLOWER] Vote denied to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)

reply.VoteGranted = false
reply.VoteGranted = raft.currentTerm <= rv.Term
if (reply.VoteGranted) {
log.Printf("[FOLLOWER] Vote granted to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)
} else {
log.Printf("[FOLLOWER] Vote denied to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)
}
raft.resetElectionTimeout()
rv.replyChan <- reply
break
// END OF MODIFY //
///////////////////

case ae := <-raft.appendEntryChan:
///////////////////
// MODIFY HERE //
// If term is outdated, update it
if (ae.Term > raft.currentTerm) {
log.Printf("[FOLLOWER] Current term '%v' outdated. Adjusting it to '%v'.", raft.currentTerm, ae.Term)
raft.currentTerm = ae.Term
raft.votedFor = 0
}
reply := &AppendEntryReply{
Term: raft.currentTerm,
}

log.Printf("[FOLLOWER] Accept AppendEntry from '%v'.\n", raft.peers[ae.LeaderID])
reply.Success = true
reply.Success = raft.currentTerm <= ae.Term
if (reply.Success) {
log.Printf("[FOLLOWER] Accept AppendEntry from '%v'.\n", raft.peers[ae.LeaderID])
} else {
log.Printf("[FOLLOWER] Rejected AppendEntry from '%v'.\n", raft.peers[ae.LeaderID])
}
raft.resetElectionTimeout()
ae.replyChan <- reply
break
// END OF MODIFY //
///////////////////
}
}
}
Expand Down Expand Up @@ -162,48 +175,78 @@ func (raft *Raft) candidateSelect() {
log.Println("[CANDIDATE] Election timeout.")
raft.currentState.Set(candidate)
return
case rvr := <-replyChan:
///////////////////
// MODIFY HERE //

case rvr := <-replyChan:
// If term is outdated, step down
if (rvr.Term > raft.currentTerm) {
log.Println("[CANDIDATE] Term outdated. Stepping down.")
raft.currentTerm = rvr.Term
raft.votedFor = 0
raft.currentState.Set(follower)
replyChan <- rvr
return
}
if rvr.VoteGranted {
log.Printf("[CANDIDATE] Vote granted by '%v'.\n", raft.peers[rvr.peerIndex])
voteCount++
log.Println("[CANDIDATE] VoteCount: ", voteCount)
// Candidate received majority of votes. Become leader.
if (voteCount > len(raft.peers) / 2) {
log.Println("[CANDIDATE] Becoming leader.")
raft.currentState.Set(leader)
return
}
break
}
log.Printf("[CANDIDATE] Vote denied by '%v'.\n", raft.peers[rvr.peerIndex])

// END OF MODIFY //
///////////////////

case rv := <-raft.requestVoteChan:
///////////////////
// MODIFY HERE //
// If term is outdated, step down
if (rv.Term > raft.currentTerm) {
log.Println("[CANDIDATE] Term outdated. Stepping down.")
raft.currentTerm = rv.Term
raft.votedFor = 0
raft.currentState.Set(follower)
raft.requestVoteChan <- rv
return
}
reply := &RequestVoteReply{
Term: raft.currentTerm,
}

log.Printf("[CANDIDATE] Vote denied to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)
reply.VoteGranted = false
reply.VoteGranted = rv.Term == raft.currentTerm
if (reply.VoteGranted) {
log.Printf("[CANDIDATE] Vote granted to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)
} else {
log.Printf("[CANDIDATE] Vote denied to '%v' for term '%v'.\n", raft.peers[rv.CandidateID], raft.currentTerm)
}
rv.replyChan <- reply
raft.resetElectionTimeout()
break
// END OF MODIFY //
///////////////////

case ae := <-raft.appendEntryChan:
///////////////////
// MODIFY HERE //
// Ignore smaller append entry
if (ae.Term < raft.currentTerm) {
log.Printf("[CANDIDATE] Rejecting AppendEntry from '%v'.\n", raft.peers[ae.LeaderID])
break
}
// If term is outdated, step down
if (ae.Term > raft.currentTerm) {
log.Println("[CANDIDATE] Term outdated. Stepping down.")
raft.currentTerm = ae.Term
raft.votedFor = 0
raft.currentState.Set(follower)
raft.appendEntryChan <- ae
return
}
reply := &AppendEntryReply{
Term: raft.currentTerm,
}

log.Printf("[CANDIDATE] Accept AppendEntry from '%v'.\n", raft.peers[ae.LeaderID])
reply.Success = true
ae.replyChan <- reply
break
// END OF MODIFY //
///////////////////
raft.currentState.Set(follower)
return
}
}
}
Expand Down Expand Up @@ -232,14 +275,26 @@ func (raft *Raft) leaderSelect() {
case <-broadcastTick:
raft.broadcastAppendEntries(replyChan)
case aet := <-replyChan:
///////////////////
// MODIFY HERE //
_ = aet
// END OF MODIFY //
///////////////////
// If term is outdated, step down
if (aet.Term > raft.currentTerm) {
log.Println("[LEADER] Term outdated. Stepping down.")
raft.currentTerm = aet.Term
raft.votedFor = 0
raft.currentState.Set(follower)
replyChan <- aet
return
}

case rv := <-raft.requestVoteChan:
///////////////////
// MODIFY HERE //
// If term is outdated, step down
if (rv.Term > raft.currentTerm) {
log.Println("[LEADER] Term outdated. Stepping down.")
raft.currentTerm = rv.Term
raft.votedFor = 0
raft.currentState.Set(follower)
raft.requestVoteChan <- rv
return
}

reply := &RequestVoteReply{
Term: raft.currentTerm,
Expand All @@ -250,12 +305,16 @@ func (raft *Raft) leaderSelect() {
rv.replyChan <- reply
break

// END OF MODIFY //
///////////////////

case ae := <-raft.appendEntryChan:
///////////////////
// MODIFY HERE //
// If term is outdated, step down
if (ae.Term > raft.currentTerm) {
log.Println("[LEADER] Term outdated. Stepping down.")
raft.currentTerm = ae.Term
raft.votedFor = 0
raft.currentState.Set(follower)
raft.appendEntryChan <- ae
return
}
reply := &AppendEntryReply{
Term: raft.currentTerm,
}
Expand All @@ -264,8 +323,6 @@ func (raft *Raft) leaderSelect() {
reply.Success = true
ae.replyChan <- reply
break
// END OF MODIFY //
///////////////////
}
}
}