Do not sleep between first attempt or between successful attempts

This commit is contained in:
David Tolnay 2016-08-22 10:15:46 +02:00 committed by James Nugent
parent be5ba7bfdc
commit e27a735da2
1 changed files with 23 additions and 17 deletions

View File

@ -2,7 +2,6 @@ package resource
import (
"log"
"math"
"time"
)
@ -72,26 +71,33 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
// Wait for the delay
time.Sleep(conf.Delay)
wait := 100 * time.Millisecond
var err error
var wait time.Duration
for tries := 0; ; tries++ {
// Wait between refreshes using an exponential backoff
// If a poll interval has been specified, choose that interval
if conf.PollInterval > 0 && conf.PollInterval < 180*time.Second {
wait = conf.PollInterval
} else {
wait = time.Duration(math.Pow(2, float64(tries))) *
100 * time.Millisecond
if wait < conf.MinTimeout {
wait = conf.MinTimeout
} else if wait > 10*time.Second {
wait = 10 * time.Second
for first := true; ; first = false {
if !first {
// If a poll interval has been specified, choose that interval.
// Otherwise bound the default value.
if conf.PollInterval > 0 && conf.PollInterval < 180*time.Second {
wait = conf.PollInterval
} else {
if wait < conf.MinTimeout {
wait = conf.MinTimeout
} else if wait > 10*time.Second {
wait = 10 * time.Second
}
}
log.Printf("[TRACE] Waiting %s before next try", wait)
time.Sleep(wait)
// Wait between refreshes using exponential backoff, except when
// waiting for the target state to reoccur.
if targetOccurence == 0 {
wait *= 2
}
}
log.Printf("[TRACE] Waiting %s before next try", wait)
time.Sleep(wait)
var currentState string
result, currentState, err = conf.Refresh()
if err != nil {