Skip to content

Use MultipartUpload for uploading chunks to s3 #27034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 4 commits into from
Mar 9, 2023
Merged

Use MultipartUpload for uploading chunks to s3 #27034

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e23aa88
feat(s3): Use multipart upload for chunked uploading
juliusknorr May 6, 2021
cb30c81
chore(psalm): Make psalm aware of sabre/uri
juliusknorr Mar 2, 2023
237dcda
chore: Bump bundles
juliusknorr Mar 8, 2023
d2a0571
tests(integration): Fix catching error only on object store
juliusknorr Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
tests(integration): Fix catching error only on object store 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 8, 2023
commit d2a05716753cc9297fa38e88a43e39dec71f3b40
16 changes: 16 additions & 0 deletions build/integration/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,4 +1078,20 @@ public function downloadedContentShouldBeTheCreatedFile() {
public function theSmultipartUploadWasSuccessful($status) {
Assert::assertEquals((int)$status, $this->response->getStatusCode());
}

/**
* @Then /^the upload should fail on object storage$/
*/
public function theUploadShouldFailOnObjectStorage() {
$descriptor = [
0 => ['pipe', 'r'],
1 => ['pipe', 'w'],
2 => ['pipe', 'w'],
];
$process = proc_open('php occ config:system:get objectstore --no-ansi', $descriptor, $pipes, '../../');
$lastCode = proc_close($process);
if ($lastCode === 0) {
$this->theHTTPStatusCodeShouldBe(500);
}
}
}
2 changes: 1 addition & 1 deletion build/integration/features/webdav-related.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ Feature: webdav-related
And user "user0" uploads new chunk v2 file "2" to id "chunking-random"
And user "user0" uploads new chunk v2 file "4" to id "chunking-random"
And user "user0" moves new chunk v2 file with id "chunking-random"
Then the HTTP status code should be "500"
Then the upload should fail on object storage

@s3-multipart
Scenario: Upload chunked file with special characters with new chunking v2
Expand Down