Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4970 from tamird/fix-raft-past-election

Browse Source 
raft: correct regression in `pastElectionTimeout`
This commit is contained in:
Xiang Li
2016-04-06 08:03:38 -07:00
parent 34375ef851 68db18667a
commit 62990fb5fa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
raft/raft.go
View File

@@ -869,15 +869,15 @@ func (r *raft) loadState(state pb.HardState) {
r.Vote = state.Vote
}
// pastElectionTimeout returns true if r.electionElapsed is greater than the
// randomized election timeout in [electiontimeout, 2 * electiontimeout - 1].
// Otherwise, it returns false.
// pastElectionTimeout returns true iff r.electionElapsed is greater
// than or equal to the randomized election timeout in
// [electiontimeout, 2 * electiontimeout - 1].
func (r *raft) pastElectionTimeout() bool {
return r.electionElapsed >= r.randomizedElectionTimeout
}
func (r *raft) resetRandomizedElectionTimeout() {
r.randomizedElectionTimeout = r.electionTimeout + r.rand.Int()%r.electionTimeout
r.randomizedElectionTimeout = r.electionTimeout + r.rand.Intn(r.electionTimeout)
}
// checkQuorumActive returns true if the quorum is active from

4
raft/raft_test.go
View File

@@ -747,7 +747,7 @@ func TestCommit(t *testing.T) {
}
}
func TestIsElectionTimeout(t *testing.T) {
func TestPastElectionTimeout(t *testing.T) {
tests := []struct {
elapse int
wprobability float64
@@ -776,7 +776,7 @@ func TestIsElectionTimeout(t *testing.T) {
got = math.Floor(got*10+0.5) / 10.0
}
if got != tt.wprobability {
t.Errorf("#%d: possibility = %v, want %v", i, got, tt.wprobability)
t.Errorf("#%d: probability = %v, want %v", i, got, tt.wprobability)
}
}
}