Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #164 from xiangli-cmu/bug_fix 

bug fix
pull/820/head
Ben Johnson 2014-01-23 11:53:27 -08:00
parent b5dbd6e4a7 2987111400
commit 3a5d9096fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
peer.go
View File

@ -192,7 +192,7 @@ func (p *Peer) sendAppendEntriesRequest(req *AppendEntriesRequest) {
// If it was unsuccessful then decrement the previous log index and // If it was unsuccessful then decrement the previous log index and
// we'll try again next time. // we'll try again next time.
} else { } 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 // this happens when there is a new leader comes up that this *leader* has not
// known yet. // known yet.
// this server can know until the new leader send a ae with higher term // this server can know until the new leader send a ae with higher term

2
server.go
View File

@ -33,7 +33,7 @@ const (
) )
const ( const (
DefaultHeartbeatTimeout = 1 * time.Millisecond DefaultHeartbeatTimeout = 50 * time.Millisecond
DefaultElectionTimeout = 150 * time.Millisecond DefaultElectionTimeout = 150 * time.Millisecond
) )