From: Yehuda Sadeh <yehuda@inktank.com>
Date: Mon, 18 Feb 2013 17:10:43 +0000 (-0800)
Subject: rgw: fix multipart uploads listing
X-Git-Tag: v0.58~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db99fb4417b87301a69cb37b00c35c838b77197e;p=ceph.git

rgw: fix multipart uploads listing

Fixes: #4177
Backport: bobtail
Listing multipart uploads had a typo, and was requiring the
wrong resource (uploadId instead of uploads).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index f5a7281f5ba1..bbcceb827ac0 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1483,8 +1483,8 @@ RGWOp *RGWHandler_ObjStore_Bucket_S3::op_get()
     return new RGWGetBucketLogging_ObjStore_S3;
   if (is_acl_op()) {
     return new RGWGetACLs_ObjStore_S3;
-  } else if (s->args.exists("uploadId")) {
-    return new RGWListMultipart_ObjStore_S3;
+  } else if (s->args.exists("uploads")) {
+    return new RGWListBucketMultiparts_ObjStore_S3;
   }
   return get_obj_op(true);
 }
@@ -1493,8 +1493,8 @@ RGWOp *RGWHandler_ObjStore_Bucket_S3::op_head()
 {
   if (is_acl_op()) {
     return new RGWGetACLs_ObjStore_S3;
-  } else if (s->args.exists("uploadId")) {
-    return new RGWListMultipart_ObjStore_S3;
+  } else if (s->args.exists("uploads")) {
+    return new RGWListBucketMultiparts_ObjStore_S3;
   }
   return get_obj_op(false);
 }