From ccac29682143fe9c6af2dfd2e458f02f7867b30b Mon Sep 17 00:00:00 2001 From: Rsplwe Date: Sat, 1 Apr 2023 21:20:52 +0800 Subject: Adjust the value of 'maxparts' to 1000 Signed-off-by: Rsplwe --- lib/private/Files/ObjectStore/S3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/Files/ObjectStore') diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php index ebc8886f12d..964d82ec581 100644 --- a/lib/private/Files/ObjectStore/S3.php +++ b/lib/private/Files/ObjectStore/S3.php @@ -73,7 +73,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload { 'Bucket' => $this->bucket, 'Key' => $urn, 'UploadId' => $uploadId, - 'MaxParts' => 10000 + 'MaxParts' => 1000 ]); return $parts->get('Parts') ?? []; } -- cgit v1.2.3 From d85e6239169458532e68d0823978c512398faa01 Mon Sep 17 00:00:00 2001 From: Rsplwe Date: Sat, 1 Apr 2023 22:56:15 +0800 Subject: s3: get remaining truncation part Signed-off-by: Rsplwe --- lib/private/Files/ObjectStore/S3.php | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'lib/private/Files/ObjectStore') diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php index 964d82ec581..e760b8b1572 100644 --- a/lib/private/Files/ObjectStore/S3.php +++ b/lib/private/Files/ObjectStore/S3.php @@ -69,13 +69,24 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload { } public function getMultipartUploads(string $urn, string $uploadId): array { - $parts = $this->getConnection()->listParts([ - 'Bucket' => $this->bucket, - 'Key' => $urn, - 'UploadId' => $uploadId, - 'MaxParts' => 1000 - ]); - return $parts->get('Parts') ?? []; + $parts = []; + $isTruncated = true; + $partNumberMarker = 0; + + while ($isTruncated) { + $result = $this->getConnection()->listParts([ + 'Bucket' => $this->bucket, + 'Key' => $urn, + 'UploadId' => $uploadId, + 'MaxParts' => 1000, + 'PartNumberMarker' => $partNumberMarker + ]); + $parts = array_merge($parts, $result->get('Parts')); + $isTruncated = $result->get('IsTruncated'); + $partNumberMarker = $result->get('NextPartNumberMarker'); + } + + return $parts; } public function completeMultipartUpload(string $urn, string $uploadId, array $result): int { -- cgit v1.2.3 From 5c6f35832c3585d4bd021dc2025243023da230bc Mon Sep 17 00:00:00 2001 From: Rsplwe Date: Mon, 3 Apr 2023 21:59:59 +0800 Subject: Update lib/private/Files/ObjectStore/S3.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Signed-off-by: Rsplwe --- lib/private/Files/ObjectStore/S3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/Files/ObjectStore') diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php index e760b8b1572..76eee2bc962 100644 --- a/lib/private/Files/ObjectStore/S3.php +++ b/lib/private/Files/ObjectStore/S3.php @@ -81,7 +81,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload { 'MaxParts' => 1000, 'PartNumberMarker' => $partNumberMarker ]); - $parts = array_merge($parts, $result->get('Parts')); + $parts = array_merge($parts, $result->get('Parts') ?? []); $isTruncated = $result->get('IsTruncated'); $partNumberMarker = $result->get('NextPartNumberMarker'); } -- cgit v1.2.3