Chunking ng cleanup #5480
Merged
Chunking ng cleanup #5480
Conversation
This file contains hidden or 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
Relates to owncloud/core#26981 We do not track the success or error of the DeleteJob because it does not matter. If it fails, it might be because the chunks were already removed. If not, the chunks will be stale, but the server must anyway do a few cleanup from time to time because we do not always remove the chunks
Stale chunks might be there because a file was removed or would just not be uploaded, for any reason. We just start the DeleteJob but we don't care if it success or not. Relates to owncloud/core#26981 One of the test is testing the case where the file is modified on the server during the upload. So this test the precondition failed error. The FakeGetReply logic was modified because resizing a 150MB big QByteArray by increment of 16k just did not scale when downloading a big file.
- Test that we recover correctly if the chunks were removed on the server. - Test changing the file localy while uploading.
ogoffart
force-pushed
the
chunking-ng-cleanup
branch
from
67029e9 to
8a70d22
Compare
Contributor
|
Is this for 2.3? |
Contributor
|
is this 2.3 material? |
jturcotte
approved these changes
Jan 25, 2017
Member
jturcotte
left a comment
jturcotte
left a comment
There was a problem hiding this comment.
Looks good, just a nitpick.
| // The upload info is stale. remove the stale chunks on the server | ||
| _transferId = progressInfo._transferid; | ||
| // Fire and forget. Any error will be ignored. | ||
| (new DeleteJob(propagator()->account(), chunkUrl(), this))->start(); |
Member
There was a problem hiding this comment.
It would be a bit cleaner and safer if chunkUrl would take the transferId as parameter (and could be made static) instead of having to set the variable and reset it later.
| if (account()->capabilities().chunkingNg()) { | ||
| foreach (uint transferId, ids) { | ||
| QUrl url = Utility::concatUrlPath(account()->url(), QLatin1String("remote.php/dav/uploads/") | ||
| + account()->davUser() + QLatin1Char('/') + QString::number(transferId)); |
Member
There was a problem hiding this comment.
Could this use the same chunkUrl implementation?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Will help for owncloud/core#26981