Merge branch 'release-5.0' into release-5.1

# Conflicts:
#	documentation/sphinx/source/downloads.rst
#	documentation/sphinx/source/release-notes.rst
#	versions.target
This commit is contained in:
A.J. Beamon 2018-01-24 14:43:41 -08:00
commit 19ed388c0e
1 changed files with 4 additions and 0 deletions

View File

@ -471,6 +471,10 @@ ACTOR Future<Reference<HTTP::Response>> doRequest_impl(Reference<BlobStoreEndpoi
.detail("ThisTry", thisTry)
.suppressFor(15, true);
// If r is not valid or not code 429 then increment the try count. 429's will not count against the attempt limit.
if(!r || r->code != 429)
++thisTry;
// We will wait delay seconds before the next retry, start with nextRetryDelay.
double delay = nextRetryDelay;
// Double but limit the *next* nextRetryDelay.