openstack/python-swiftclient
Code Issues Proposed changes

Adds max-backoff for retries in Connection.

Browse Source 
The max-backoff concept prevents the backoff used in _retry to double infinitely (which in turn causes wait times of an hour or more between retries).

As per review, changed code to use min instead.

Fixes: bug #1183542

Change-Id: Ic084f54069b7fa7a33604741487045c5e697ff06
This commit is contained in:
Mike Widman 2013-07-10 10:52:02 -07:00
parent c460ebff0a
commit 6411fd3846
1 changed files with 5 additions and 4 deletions

9
swiftclient/client.py

@ -1044,9 +1044,9 @@ class Connection(object):
def __init__(self, authurl=None, user=None, key=None, retries=5, def __init__(self, authurl=None, user=None, key=None, retries=5,
preauthurl=None, preauthtoken=None, snet=False, preauthurl=None, preauthtoken=None, snet=False,
starting_backoff=1, tenant_name=None, os_options=None, starting_backoff=1, max_backoff=64, tenant_name=None,
auth_version="1", cacert=None, insecure=False, os_options=None, auth_version="1", cacert=None,
ssl_compression=True): insecure=False, ssl_compression=True):
""" """
:param authurl: authentication URL :param authurl: authentication URL
:param user: user name to authenticate as :param user: user name to authenticate as
@ -1081,6 +1081,7 @@ class Connection(object):
self.attempts = 0 self.attempts = 0
self.snet = snet self.snet = snet
self.starting_backoff = starting_backoff self.starting_backoff = starting_backoff
self.max_backoff = max_backoff
self.auth_version = auth_version self.auth_version = auth_version
self.os_options = os_options or {} self.os_options = os_options or {}
if tenant_name: if tenant_name:
@ -1152,7 +1153,7 @@ class Connection(object):
else: else:
raise raise
sleep(backoff) sleep(backoff)
backoff *= 2 backoff = min(backoff * 2, self.max_backoff)
if reset_func: if reset_func:
reset_func(func, *args, **kwargs) reset_func(func, *args, **kwargs)