mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integration: expose ElectionTimeout, multiply ticks to timeout

Browse Source 
To be consistent with etcdserver

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee
2017-10-30 09:22:40 -07:00
parent 87ad10c155
commit a41f3b64aa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/cluster.go
View File

@ -608,8 +608,8 @@ func (m *member) listenGRPC() error {
return nil return nil
} }
func (m *member) electionTimeout() time.Duration { func (m *member) ElectionTimeout() time.Duration {
return time.Duration(m.s.Cfg.ElectionTicks) * time.Millisecond return time.Duration(m.s.Cfg.ElectionTicks*int(m.s.Cfg.TickMs)) * time.Millisecond
} }
func (m *member) ID() types.ID { return m.s.ID() } func (m *member) ID() types.ID { return m.s.ID() }

4
integration/network_partition_test.go
View File

@ -44,7 +44,7 @@ func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) {
clus.waitNoLeader(t, minorityMembers) clus.waitNoLeader(t, minorityMembers)
// wait extra election timeout // wait extra election timeout
time.Sleep(2 * majorityMembers[0].electionTimeout()) time.Sleep(2 * majorityMembers[0].ElectionTimeout())
// new leader must be from majority // new leader must be from majority
clus.waitLeader(t, majorityMembers) clus.waitLeader(t, majorityMembers)
@ -92,7 +92,7 @@ func testNetworkPartition5MembersLeaderInMajority(t *testing.T) error {
clus.waitNoLeader(t, minorityMembers) clus.waitNoLeader(t, minorityMembers)
// wait extra election timeout // wait extra election timeout
time.Sleep(2 * majorityMembers[0].electionTimeout()) time.Sleep(2 * majorityMembers[0].ElectionTimeout())
// leader must be hold in majority // leader must be hold in majority
leadIndex2 := clus.waitLeader(t, majorityMembers) leadIndex2 := clus.waitLeader(t, majorityMembers)