mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Retry S3 requests on 500 or 503 in addition to interruption

Browse source 
And adjust S3 success/backoff counters on success
This commit is contained in:
Dan Stillman 2016-02-01 03:58:45 -05:00
parent ab9330d88e
commit ec28c5a35d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/xpcom/storage/zfs.js
View file

@ -869,7 +869,7 @@ Zotero.Sync.Storage.ZFS = (function () {
return; return;
} }
if (status == 0) { if (status == 0 || status == 500 || status == 503) {
if (_s3ConsecutiveFailures >= _maxS3ConsecutiveFailures) { if (_s3ConsecutiveFailures >= _maxS3ConsecutiveFailures) {
Zotero.debug(_s3ConsecutiveFailures Zotero.debug(_s3ConsecutiveFailures
+ " consecutive S3 failures -- aborting", 1); + " consecutive S3 failures -- aborting", 1);
@ -921,6 +921,13 @@ Zotero.Sync.Storage.ZFS = (function () {
Zotero.debug("Finished download of " + destFile.path); Zotero.debug("Finished download of " + destFile.path);
// Decrease backoff delay on successful download
if (_s3Backoff > 1) {
_s3Backoff /= 2;
}
// And reset consecutive failures
_s3ConsecutiveFailures = 0;
try { try {
deferred.resolve(Zotero.Sync.Storage.processDownload(data)); deferred.resolve(Zotero.Sync.Storage.processDownload(data));
} }