Reset stalled state in upload data after retrying #32283
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ownclouders
added
Type:Bug
p2-high
Codecov Report
@@ Coverage Diff @@
## master #32283 +/- ##
=========================================
Coverage 64.01% 64.01%
Complexity 18559 18559
=========================================
Files 1171 1171
Lines 69834 69834
Branches 1267 1267
=========================================
Hits 44706 44706
Misses 24758 24758
Partials 370 370
Continue to review full report at Codecov.
|
PVince81
force-pushed
the
reset-stalled-upload-flag
branch
from
7e00f96 to
c530975
Compare
|
added unit test |
|
butonic
approved these changes
Aug 14, 2018
| @@ -1124,6 +1125,7 @@ OC.Uploader.prototype = _.extend({ | |||
| }); | |||
|
|
|||
| // clear the previous data: | |||
| upload.data.stalled = false; | |||
| @@ -854,7 +854,8 @@ OC.Uploader.prototype = _.extend({ | |||
| if (progress >= total) { | |||
| // change message if we stalled at 100% | |||
| this.$uploadprogressbar.find('.label .desktop').text(t('core', 'Processing files...')); | |||
| } else if (new Date().getTime() - this._lastProgressTime >= this._uploadStallTimeout * 1000 ) { | |||
| } | |||
DeepDiver1975
added a commit
that referenced
this pull request
Aug 14, 2018
…ad-flag Reset stalled state in upload data after retrying
DeepDiver1975
added a commit
that referenced
this pull request
Aug 16, 2018
[stable10] Merge pull request #32283 from owncloud/reset-stalled-uplo…
ownclouders
added
p3-medium
|
Backport |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
After retrying a chunk, we need to reset the upload object's "stalled" state, else the next stalled chunk is not retried.
Related Issue
Fixes #32282
Motivation and Context
How Has This Been Tested?
See steps in original ticket as it needs patching
Screenshots (if appropriate):
Types of changes
Checklist:
Open tasks: