Merge pull request #2090 from bdarnell/raft-ticks

raft: Use <= instead of < for heartbeat ticks.
release-2.0
Yicheng Qin 2015-01-14 13:01:33 -08:00
commit 238b17fee0
2 changed files with 2 additions and 2 deletions

View File

@ -346,7 +346,7 @@ func (r *raft) tickElection() {
// tickHeartbeat is run by leaders to send a MsgBeat after r.heartbeatTimeout.
func (r *raft) tickHeartbeat() {
r.elapsed++
if r.elapsed > r.heartbeatTimeout {
if r.elapsed >= r.heartbeatTimeout {
r.elapsed = 0
r.Step(pb.Message{From: r.id, Type: pb.MsgBeat})
}

View File

@ -120,7 +120,7 @@ func TestLeaderBcastBeat(t *testing.T) {
r.appendEntry(pb.Entry{Index: uint64(i) + 1})
}
for i := 0; i <= hi; i++ {
for i := 0; i < hi; i++ {
r.tick()
}