summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Merritt <sam@swiftstack.com>2014-03-04 18:40:12 -0800
committerSamuel Merritt <sam@swiftstack.com>2014-03-04 18:40:12 -0800
commit2ed5a4ae86fdb9e1970e081c14f463b7a72b166a (patch)
treeb3d5b88fbc03447242a64325cf5e53fcc8605666
parentd7744acde79deed921033947f7d6bbfe1aa6c266 (diff)
downloadswift-2ed5a4ae86fdb9e1970e081c14f463b7a72b166a.tar.gz
Speed up failing InternalClient requests
InternalClient.make_request was sleeping after every attempt, including the last one. We don't need to sleep after the final attempt; we can just return failure. Change-Id: Ieee5f96afb5b39a659d8438a237bfd907405165a
-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 b19ba33b0..480d44b55 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)