summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-07 21:27:34 +0000
committerGerrit Code Review <review@openstack.org>2014-03-07 21:27:34 +0000
commit424d6457ab85b7267c1f2d1733f68baa5cfb5fff (patch)
tree0344e1d1da34c9ce0e5f6c8e5d132d226b92b610
parent0b1b6d80807e35573e30a4133f2406bf404bbf0d (diff)
parent2ed5a4ae86fdb9e1970e081c14f463b7a72b166a (diff)
downloadswift-424d6457ab85b7267c1f2d1733f68baa5cfb5fff.tar.gz
Merge "Speed up failing InternalClient requests"
-rw-r--r--swift/common/internal_client.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/swift/common/internal_client.py b/swift/common/internal_client.py
index d23e76026..b0fda5f2b 100644
--- a/swift/common/internal_client.py
+++ b/swift/common/internal_client.py
@@ -178,7 +178,9 @@ class InternalClient(object):
return resp
except (Exception, Timeout):
exc_type, exc_value, exc_traceback = exc_info()
- sleep(2 ** (attempt + 1))
+ # sleep only between tries, not after each one
+ if attempt < self.request_tries - 1:
+ sleep(2 ** (attempt + 1))
if resp:
raise UnexpectedResponse(
_('Unexpected response: %s') % resp.status, resp)