rgw: fix abort multipart upload

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index e41634fa8c8b122e44f10f7377a9a95abef97ade..5a996338e3c495af103233b31283e7ccc488662d 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1071,20 +1071,21 @@ void RGWAbortMultipart::execute()
   map<string, bufferlist> attrs;
   rgw_obj meta_obj;
 
-  if (upload_id.empty() || s->object_str.empty())
-    goto done;
 
-  ret = get_multiparts_info(s, oid, obj_parts, policy, attrs);
-  if (ret < 0)
+  if (upload_id.empty() || s->object_str.empty())
     goto done;
 
-  oid = s->object;
+  oid = s->object_str;
   oid.append(".");
   oid.append(upload_id);
   meta_oid = oid;
   prefix = oid;
   prefix.append(".");
 
+  ret = get_multiparts_info(s, oid, obj_parts, policy, attrs);
+  if (ret < 0)
+    goto done;
+
   for (obj_iter = obj_parts.begin(); obj_iter != obj_parts.end(); ++obj_iter) {
     oid = prefix;
     char buf[16];

diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h
index 12c53bf1f5325c831c576580ef69d46390b51f45..3a7254276b1b5992df4b0cfdc6fe2a221de7a13e 100644 (file)
--- a/src/rgw/rgw_rest_s3.h
+++ b/src/rgw/rgw_rest_s3.h
@@ -145,7 +145,7 @@ class RGWHandler_REST_S3 : public RGWHandler_REST {
   RGWPutACLs_REST_S3 put_acls_op;
   RGWInitMultipart_REST_S3 init_multipart;
   RGWCompleteMultipart_REST_S3 complete_multipart;
-  RGWCompleteMultipart_REST_S3 abort_multipart;
+  RGWAbortMultipart_REST_S3 abort_multipart;
   RGWListMultipart_REST_S3 list_multipart;
   RGWListBucketMultiparts_REST_S3 list_bucket_multiparts;