Merge pull request goraft#164 from xiangli-cmu/bug_fix

bug fix
coreos · Jan 23, 2014 · 3a5d909 · 3a5d909
2 parents b5dbd6e + 2987111
commit 3a5d909
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/peer.go b/peer.go
@@ -192,7 +192,7 @@ func (p *Peer) sendAppendEntriesRequest(req *AppendEntriesRequest) {
 		// If it was unsuccessful then decrement the previous log index and
 		// we'll try again next time.
 	} else {
-		if resp.Term() > p.server.Term() {
+		if resp.Term() > p.server.Term() || resp.CommitIndex() > p.server.CommitIndex() {
 			// this happens when there is a new leader comes up that this *leader* has not
 			// known yet.
 			// this server can know until the new leader send a ae with higher term

diff --git a/server.go b/server.go
@@ -33,7 +33,7 @@ const (
 )
 
 const (
-	DefaultHeartbeatTimeout = 1 * time.Millisecond
+	DefaultHeartbeatTimeout = 50 * time.Millisecond
 	DefaultElectionTimeout  = 150 * time.Millisecond
 )