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 #6649 from fanminshi/discovery_max_wait

Browse Source 
discovery: add upper limit for waiting on a retry
This commit is contained in:
fanmin shi 2016-10-14 09:46:08 -07:00 committed by GitHub
commit 77d6ecbc5f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
discovery/discovery.go
View File

@ -53,6 +53,7 @@ var (
var ( var (
// Number of retries discovery will attempt before giving up and erroring out. // Number of retries discovery will attempt before giving up and erroring out.
nRetries = uint(math.MaxUint32) nRetries = uint(math.MaxUint32)
maxExpoentialRetries = uint(8)
) )
// JoinCluster will connect to the discovery service at the given url, and // JoinCluster will connect to the discovery service at the given url, and
@ -268,9 +269,14 @@ func (d *discovery) checkCluster() ([]*client.Node, int, uint64, error) {
func (d *discovery) logAndBackoffForRetry(step string) { func (d *discovery) logAndBackoffForRetry(step string) {
d.retries++ d.retries++
retryTime := time.Second * (0x1 << d.retries) // logAndBackoffForRetry stops exponential backoff when the retries are more than maxExpoentialRetries and is set to a constant backoff afterward.
plog.Infof("%s: error connecting to %s, retrying in %s", step, d.url, retryTime) retries := d.retries
d.clock.Sleep(retryTime) if retries > maxExpoentialRetries {
retries = maxExpoentialRetries
}
retryTimeInSecond := time.Duration(0x1<<retries) * time.Second
plog.Infof("%s: error connecting to %s, retrying in %s", step, d.url, retryTimeInSecond)
d.clock.Sleep(retryTimeInSecond)
} }
func (d *discovery) checkClusterRetry() ([]*client.Node, int, uint64, error) { func (d *discovery) checkClusterRetry() ([]*client.Node, int, uint64, error) {