]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: In RGWListBucketMultiparts::execute(), use list_bucket_multipart()
authorAbhishek Varshney <abhishek.varshney@flipkart.com>
Fri, 16 Jun 2017 12:28:14 +0000 (17:58 +0530)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Tue, 20 Jun 2017 17:42:37 +0000 (17:42 +0000)
Fixes: http://tracker.ceph.com/issues/17164
Signed-off-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
src/rgw/rgw_op.cc

index b50e85e5a386050bec69fadc90d51fa88604a703..64ec8a02b5c5fe1a6d45af1c87b8a6fb992c30bf 100644 (file)
@@ -5333,17 +5333,12 @@ void RGWListBucketMultiparts::execute()
   }
   marker_meta = marker.get_meta();
 
-  RGWRados::Bucket target(store, s->bucket_info);
-  RGWRados::Bucket::List list_op(&target);
-
-  list_op.params.prefix = prefix;
-  list_op.params.delim = delimiter;
-  list_op.params.marker = marker_meta;
-  list_op.params.ns = mp_ns;
-  list_op.params.filter = &mp_filter;
+  op_ret = list_bucket_multiparts(store, s->bucket_info, prefix, marker_meta, delimiter,
+                                  max_uploads, &objs, &common_prefixes, &is_truncated);
+  if (op_ret < 0) {
+    return;
+  }
 
-  op_ret = list_op.list_objects(max_uploads, &objs, &common_prefixes,
-                               &is_truncated);
   if (!objs.empty()) {
     vector<rgw_bucket_dir_entry>::iterator iter;
     RGWMultipartUploadEntry entry;