You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/06/01 20:35:43 UTC

jclouds git commit: Abort multipart upload on putMultipartBlob error

Repository: jclouds
Updated Branches:
  refs/heads/master bf7d864c4 -> 209152e30


Abort multipart upload on putMultipartBlob error

This avoids dangling incomplete MPU.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/209152e3
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/209152e3
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/209152e3

Branch: refs/heads/master
Commit: 209152e30a28ffda7bd569a0198d75a3bf802f7e
Parents: bf7d864
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Jun 1 13:34:53 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Jun 1 13:34:53 2016 -0700

----------------------------------------------------------------------
 .../blobstore/internal/BaseBlobStore.java       | 27 ++++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/209152e3/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
index fc3bedb..818a154 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
@@ -324,18 +324,23 @@ public abstract class BaseBlobStore implements BlobStore {
    @Beta
    protected String putMultipartBlob(String container, Blob blob, PutOptions overrides) {
       MultipartUpload mpu = initiateMultipartUpload(container, blob.getMetadata(), overrides);
-      List<MultipartPart> parts = Lists.newArrayList();
-      long contentLength = blob.getMetadata().getContentMetadata().getContentLength();
-      MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm(
-            getMinimumMultipartPartSize(), getMaximumMultipartPartSize(), getMaximumNumberOfParts());
-      long partSize = algorithm.calculateChunkSize(contentLength);
-      int partNumber = 1;
-      for (Payload payload : slicer.slice(blob.getPayload(), partSize)) {
-         MultipartPart part = uploadMultipartPart(mpu, partNumber, payload);
-         parts.add(part);
-         ++partNumber;
+      try {
+         List<MultipartPart> parts = Lists.newArrayList();
+         long contentLength = blob.getMetadata().getContentMetadata().getContentLength();
+         MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm(
+               getMinimumMultipartPartSize(), getMaximumMultipartPartSize(), getMaximumNumberOfParts());
+         long partSize = algorithm.calculateChunkSize(contentLength);
+         int partNumber = 1;
+         for (Payload payload : slicer.slice(blob.getPayload(), partSize)) {
+            MultipartPart part = uploadMultipartPart(mpu, partNumber, payload);
+            parts.add(part);
+            ++partNumber;
+         }
+         return completeMultipartUpload(mpu, parts);
+      } catch (RuntimeException re) {
+         abortMultipartUpload(mpu);
+         throw re;
       }
-      return completeMultipartUpload(mpu, parts);
    }
 
    private static HttpResponseException returnResponseException(int code) {