Merge pull request #55 from xiangli-cmu/master

when candidate stepdown it should break the loop; gofmt

log.go

@@ -31,7 +31,7 @@ type Log struct {
 // The results of the applying a log entry.
 type logResult struct {
 	returnValue interface{}
-	err error
+	err         error
 }
 
 //------------------------------------------------------------------------------
@@ -172,7 +172,7 @@ func (l *Log) open(path string) error {
 
 			// Apply the command.
 			returnValue, err := l.ApplyFunc(entry.Command)
-			l.results = append(l.results, &logResult{returnValue:returnValue, err:err})
+			l.results = append(l.results, &logResult{returnValue: returnValue, err: err})
 
 			lastIndex += n
 		}
@@ -277,7 +277,7 @@ func (l *Log) getEntryResult(entry *LogEntry, clear bool) (interface{}, error) {
 			if clear {
 				result.returnValue = nil
 			}
-		
+
 			return result.returnValue, result.err
 		}
 	}
@@ -374,7 +374,7 @@ func (l *Log) setCommitIndex(index uint64) error {
 
 		// Apply the changes to the state machine and store the error code.
 		returnValue, err := l.ApplyFunc(entry.Command)
-		l.results[entryIndex] = &logResult{returnValue:returnValue, err:err}
+		l.results[entryIndex] = &logResult{returnValue: returnValue, err: err}
 	}
 	return nil
 }

log_entry.go

@@ -19,10 +19,10 @@ import (
 // A log entry stores a single item in the log.
 type LogEntry struct {
 	log     *Log
-	Index   uint64      `json:"index"`
-	Term    uint64      `json:"term"`
-	Command Command     `json:"command"`
-	commit  chan bool   `json:"-"`
+	Index   uint64    `json:"index"`
+	Term    uint64    `json:"term"`
+	Command Command   `json:"command"`
+	commit  chan bool `json:"-"`
 }
 
 // A temporary interface used for unmarshaling log entries.

server.go

@@ -361,7 +361,7 @@ func (s *Server) setCurrentTerm(term uint64, leaderName string, append bool) {
 		s.leader = leaderName
 		s.votedFor = ""
 		return
-	} 
+	}
 
 	// discover new leader
 	if term == s.currentTerm && s.state == Candidate && append {
@@ -392,7 +392,7 @@ func (s *Server) loop() {
 
 	for {
 		state := s.State()
-		
+
 		s.debugln("server.loop.run ", state)
 		switch state {
 		case Follower:
@@ -520,6 +520,11 @@ func (s *Server) candidateLoop() {
 				// Callback to event.
 				e.c <- err
 
+				// both process AER and RVR can make the server to follower
+				if s.State() == Follower {
+					break
+				}
+
 			case <-timeoutChan:
 				break
 			}