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

Detect TimeoutException during ZFS S3 upload

Browse source 
We're not currently setting a timeout, so this shouldn't happen, but
someone [1] is getting a timeout error with undefined ms and
NS_BINDING_ABORTED from the channel. It also happened during a /fulltext
upload, so it's not limited to S3, but this fix should give a more
helpful error message for such errors during file syncing.

[1] https://forums.zotero.org/discussion/79286/
This commit is contained in:
Dan Stillman 2019-09-29 04:01:33 -04:00
parent 96caed8453
commit a9c10309f7
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/http.js
View file

@ -87,7 +87,7 @@ Zotero.HTTP = new function() {
this.CancelledException.prototype = Object.create(Error.prototype);
this.TimeoutException = function(ms) {
this.message = "XMLHttpRequest has timed out after " + ms + "ms";
this.message = "XMLHttpRequest has timed out" + (ms ? ` after ${ms} ms` : "");
this.stack = new Error().stack;
};
this.TimeoutException.prototype = Object.create(Error.prototype);

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

@ -683,6 +683,30 @@ Zotero.Sync.Storage.Mode.ZFS.prototype = {
return this._uploadFile(request, item, params);
}
}
// Alternative to the above. There was at least one report of this happening even though
// a timeout isn't being set, with 2152398850 (NS_BINDING_ABORTED) from the channel:
// https://forums.zotero.org/discussion/79286/
else if (e instanceof Zotero.HTTP.TimeoutException) {
Zotero.logError(e);
if (this._s3ConsecutiveFailures >= this._maxS3ConsecutiveFailures) {
Zotero.debug(this._s3ConsecutiveFailures
+ " consecutive S3 failures -- aborting", 1);
this._s3ConsecutiveFailures = 0;
let e = Zotero.getString('sync.storage.error.zfs.restart', Zotero.appName);
throw new Error(e);
}
else {
Zotero.logError("S3 timed out (" + item.libraryKey + ") -- retrying upload");
if (this._s3Backoff < this._maxS3Backoff) {
this._s3Backoff *= 2;
}
this._s3ConsecutiveFailures++;
Zotero.debug("Delaying " + item.libraryKey + " upload for "
+ this._s3Backoff + " seconds", 2);
yield Zotero.Promise.delay(this._s3Backoff * 1000);
return this._uploadFile(request, item, params);
}
}
else if (e.status == 500) {
// TODO: localize
throw new Error("File upload failed. Please try again.");