status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-10 22:06:20 +00:00
Code Issues Projects Releases Wiki Activity

Run the waited-for function before sleeping, and ramp up the sleep exponentially.

Browse Source
This commit is contained in:
James Phillips 2017-01-26 17:11:16 -08:00
parent 8c33ddbee2
commit 8493d239ac
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testutil/server.go
View File

@ -310,7 +310,6 @@ func (s *TestServer) waitForLeader() {
// Ensure we have a leader and a node registration.
if leader := resp.Header.Get("X-Consul-KnownLeader"); leader != "true" {
fmt.Println(leader)
return false, fmt.Errorf("Consul leader status: %#v", leader)
}
index, err = strconv.ParseInt(resp.Header.Get("X-Consul-Index"), 10, 64)

21
testutil/wait.go
View File

@ -10,19 +10,28 @@ import (
type testFn func() (bool, error)
type errorFn func(error)
func WaitForResult(test testFn, error errorFn) {
for retries := 100; retries > 0; retries-- {
time.Sleep(100 * time.Millisecond)
const (
baseWait = 1 * time.Millisecond
maxWait = 100 * time.Millisecond
)
success, err := test()
func WaitForResult(try testFn, fail errorFn) {
var err error
wait := baseWait
for retries := 100; retries > 0; retries-- {
var success bool
success, err = try()
if success {
return
}
if retries == 0 {
error(err)
time.Sleep(wait)
wait *= 2
if wait > maxWait {
wait = maxWait
}
}
fail(err)
}
type rpcFn func(string, interface{}, interface{}) error