diff options
| author | James Saryerwinnie <js@jamesls.com> | 2013-04-05 18:15:53 -0700 |
|---|---|---|
| committer | James Saryerwinnie <js@jamesls.com> | 2013-04-05 18:15:53 -0700 |
| commit | f24a166f062dff20eb517ea9ccf165f267de8234 (patch) | |
| tree | d82918790d040407b1e180c51bc68ce9d7e40643 /boto/glacier | |
| parent | ab5c88d3fb0e95e476d8af8da69471bd7270e36b (diff) | |
| parent | f4b033712f53feee643b77894543f99f362b3277 (diff) | |
| download | boto-f24a166f062dff20eb517ea9ccf165f267de8234.tar.gz | |
Merge branch 'glacier-exceptions' into develop
Closes #1422
* glacier-exceptions:
Let total attempts by 1 + num_retries
Add more diagnostics to debug logs
Diffstat (limited to 'boto/glacier')
| -rw-r--r-- | boto/glacier/concurrent.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/boto/glacier/concurrent.py b/boto/glacier/concurrent.py index f324c76f..af727ec2 100644 --- a/boto/glacier/concurrent.py +++ b/boto/glacier/concurrent.py @@ -229,14 +229,16 @@ class UploadWorkerThread(TransferThread): def _process_chunk(self, work): result = None - for _ in xrange(self._num_retries): + for i in xrange(self._num_retries + 1): try: result = self._upload_chunk(work) break except self._retry_exceptions, e: log.error("Exception caught uploading part number %s for " - "vault %s, filename: %s", work[0], self._vault_name, - self._filename) + "vault %s, attempt: (%s / %s), filename: %s, " + "exception: %s, msg: %s", + work[0], self._vault_name, i + 1, self._num_retries + 1, + self._filename, e.__class__, e) time.sleep(self._time_between_retries) result = e return result |