Skip to content

Make S3 MultipartUpload Concurrency Configurable - Address S3 Timeouts #24330

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

Closed
J-Light wants to merge 2 commits into from
Closed

Make S3 MultipartUpload Concurrency Configurable - Address S3 Timeouts #24330

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1defbe6
Make S3 MultipartUpload Concurrency Configurable
J-Light Nov 24, 2020
6a7fbd3
Merge branch 'master' into fix/s3_largefile_timeouts
skjnldsv Aug 18, 2021
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
Merge branch 'master' into fix/s3_largefile_timeouts
  • Loading branch information
@skjnldsv
skjnldsv authored Aug 18, 2021
commit 6a7fbd3ce60077cdd09133bf2d118619b727e347
3 changes: 3 additions & 0 deletions lib/private/Files/ObjectStore/S3ObjectTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ public function writeObject($urn, $stream, string $mimetype = null) {
'key' => $urn,
'part_size' => $this->uploadPartSize,
'concurrency' => $this->config->getSystemValue('objectstore.arguments.concurrency', 5),
Copy link
Member

@juliusknorr juliusknorr Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should rather be passed as a param of the existing object store configuration which are parsed in the S3ConnectionTrait, similar to how it is done for the uploadPartSize already:

server/lib/private/Files/ObjectStore/S3ConnectionTrait.php

Line 79 in b73d275

$this->uploadPartSize = !isset($params['uploadPartSize']) ? 524288000 : $params['uploadPartSize'];

'params' => [
'ContentType' => $mimetype
],
]);

try {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.