From e4e5e735db2ae1d73432a3ec1ebf1a6654f2eda8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Sep 2017 18:24:53 +0200 Subject: [PATCH] multipart upload for s3 object storage Signed-off-by: Robin Appelman --- .../Files/ObjectStore/S3ObjectTrait.php | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php index 3ba4da92b9..f7d9fb305c 100644 --- a/lib/private/Files/ObjectStore/S3ObjectTrait.php +++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php @@ -21,6 +21,8 @@ namespace OC\Files\ObjectStore; +use Aws\Exception\MultipartUploadException; +use Aws\S3\MultipartUploader; use Aws\S3\S3Client; use Psr\Http\Message\StreamInterface; @@ -60,11 +62,26 @@ trait S3ObjectTrait { * @since 7.0.0 */ function writeObject($urn, $stream) { - $this->getConnection()->putObject([ - 'Bucket' => $this->bucket, - 'Key' => $urn, - 'Body' => $stream + $uploader = new MultipartUploader($this->getConnection(), $stream, [ + 'bucket' => $this->bucket, + 'key' => $urn, ]); + $tries = 0; + do { + try { + $result = $uploader->upload(); + } catch (MultipartUploadException $e) { + rewind($stream); + $tries++; + if ($tries < 5) { + $uploader = new MultipartUploader($this->getConnection(), $stream, [ + 'state' => $e->getState() + ]); + } else { + $this->getConnection()->abortMultipartUpload($e->getState()->getId()); + } + } + } while (!isset($result) && $tries < 5); } /** @@ -79,4 +96,4 @@ trait S3ObjectTrait { 'Key' => $urn ]); } -} \ No newline at end of file +}