From 4f97c0b039cc801496b1fe46cd4194d859b136e6 Mon Sep 17 00:00:00 2001 From: Leane Schlundt Date: Tue, 9 Apr 2024 10:25:09 +0200 Subject: [PATCH 1/4] Set RETRY_UPLOAD to 3 --- src/resources/assets/js/createContainer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/assets/js/createContainer.vue b/src/resources/assets/js/createContainer.vue index 7510da7..5724e7b 100644 --- a/src/resources/assets/js/createContainer.vue +++ b/src/resources/assets/js/createContainer.vue @@ -6,7 +6,7 @@ import {LoaderMixin, handleErrorResponse, FileBrowserComponent} from './import'; import {sizeForHumans} from './utils'; // Number of times a file upload is retried. -const RETRY_UPLOAD = 2; +const RETRY_UPLOAD = 3; export default { mixins: [LoaderMixin], From 7fe75357208c5f1dc922000ecd2e5fc0b73cfadc Mon Sep 17 00:00:00 2001 From: Leane Schlundt Date: Tue, 9 Apr 2024 10:32:32 +0200 Subject: [PATCH 2/4] Add 5 s delay for file re-uploads --- src/resources/assets/js/createContainer.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/resources/assets/js/createContainer.vue b/src/resources/assets/js/createContainer.vue index 5724e7b..2434212 100644 --- a/src/resources/assets/js/createContainer.vue +++ b/src/resources/assets/js/createContainer.vue @@ -428,9 +428,13 @@ export default { // Try uploading again on server error until number of retries is // reached. if (e.status >= 500 && retryCount < RETRY_UPLOAD) { - return this.uploadBlob(blob, prefix, chunkIndex, totalChunks, retryCount + 1); + // Add delay to prevent failing uploads due to e.g. BIIGLE instance updates or + // short moments of unavailability. + setTimeout( + () => {return this.uploadBlob(blob, prefix, chunkIndex, totalChunks, retryCount + 1)}, + 5000); } - + throw e; }); }, From 090708edcb380f8146ae53397738edad0c295666 Mon Sep 17 00:00:00 2001 From: Leane Schlundt Date: Wed, 10 Apr 2024 07:47:16 +0200 Subject: [PATCH 3/4] Fix delay by wrapping it in promise --- src/resources/assets/js/createContainer.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resources/assets/js/createContainer.vue b/src/resources/assets/js/createContainer.vue index 2434212..fd0b783 100644 --- a/src/resources/assets/js/createContainer.vue +++ b/src/resources/assets/js/createContainer.vue @@ -430,9 +430,9 @@ export default { if (e.status >= 500 && retryCount < RETRY_UPLOAD) { // Add delay to prevent failing uploads due to e.g. BIIGLE instance updates or // short moments of unavailability. - setTimeout( - () => {return this.uploadBlob(blob, prefix, chunkIndex, totalChunks, retryCount + 1)}, - 5000); + return new Vue.Promise((resolve) => { + setTimeout(() => resolve(this.uploadBlob(blob, prefix, chunkIndex, totalChunks, retryCount + 1)), 5000); + }); } throw e; From dfccb6e800819277fd13583c67258b55521d5e12 Mon Sep 17 00:00:00 2001 From: Martin Zurowietz Date: Wed, 10 Apr 2024 09:17:35 +0200 Subject: [PATCH 4/4] Update src/resources/assets/js/createContainer.vue --- src/resources/assets/js/createContainer.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/resources/assets/js/createContainer.vue b/src/resources/assets/js/createContainer.vue index fd0b783..406ca47 100644 --- a/src/resources/assets/js/createContainer.vue +++ b/src/resources/assets/js/createContainer.vue @@ -434,7 +434,6 @@ export default { setTimeout(() => resolve(this.uploadBlob(blob, prefix, chunkIndex, totalChunks, retryCount + 1)), 5000); }); } - throw e; }); },