vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5164 from gyuho/sleep_for_slow_network 

etcd-tester: wait more for slow network recovery
release-3.0
Gyu-Ho Lee 2016-04-22 15:36:50 -07:00
parent da1138f8de 6a0664d701
commit 0dd9c2520b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/functional-tester/etcd-tester/failure.go
View File

@ -22,8 +22,14 @@ import (
const (
snapshotCount = 10000
slowNetworkLatency = 1000 // 1-second
slowNetworkLatency = 500 // 500 millisecond
randomVariation = 50
// Wait more when it recovers from slow network, because network layer
// needs extra time to propogate traffic control (tc command) change.
// Otherwise, we get different hash values from the previous revision.
// For more detail, please see https://github.com/coreos/etcd/issues/5121.
waitRecover = 5 * time.Second
)
type failure interface {
@ -325,6 +331,7 @@ func (f *failureSlowNetworkOneMember) Recover(c *cluster, round int) error {
if err := c.Agents[i].RemoveLatency(); err != nil {
return err
}
time.Sleep(waitRecover)
return c.WaitHealth()
}
@ -357,6 +364,7 @@ func (f *failureSlowNetworkLeader) Recover(c *cluster, round int) error {
if err := c.Agents[f.idx].RemoveLatency(); err != nil {
return err
}
time.Sleep(waitRecover)
return c.WaitHealth()
}
@ -388,5 +396,6 @@ func (f *failureSlowNetworkAll) Recover(c *cluster, round int) error {
return err
}
}
time.Sleep(waitRecover)
return c.WaitHealth()
}