]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix bugs in listobjectsv1 32239/head
authoralbIN7 <aantony@redhat.com>
Wed, 3 Jul 2019 19:26:50 +0000 (00:56 +0530)
committerNathan Cutler <ncutler@suse.com>
Fri, 24 Jan 2020 15:17:08 +0000 (16:17 +0100)
Fixes: https://tracker.ceph.com/issues/40663
Signed-off-by: Albin Antony <aantony@redhat.com>
(cherry picked from commit c9a8e3acb130fd0e7f355440f4802f4f065d213f)

Conflicts:
src/rgw/rgw_rest_s3.cc
- deleted "if (is_truncated && !next_marker.empty()) {" conditional
  block is different in nautilus
- white space change not relevant to nautilus
- "s->formatter->close_section()" change not needed in nautilus

src/rgw/rgw_rest_s3.cc

index 4c2d9167efb24542c0d3a619005c211d113b8e63..05ff400324a4c5fa9508e724218b5b1642ce7d28 100644 (file)
@@ -742,18 +742,11 @@ return 0;
 
 void RGWListBucket_ObjStore_S3::send_common_versioned_response()
 {
-  
   if (!s->bucket_tenant.empty()) {
     s->formatter->dump_string("Tenant", s->bucket_tenant);
   }
   s->formatter->dump_string("Name", s->bucket_name);
   s->formatter->dump_string("Prefix", prefix);
-  s->formatter->dump_string("KeyMarker", marker.name);
-  s->formatter->dump_string("VersionIdMarker", marker.instance);
-  if (is_truncated && !next_marker.empty()) {
-    s->formatter->dump_string("NextKeyMarker", next_marker.name);
-    s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
-  }
   s->formatter->dump_int("MaxKeys", max);
   if (!delimiter.empty()) {
     s->formatter->dump_string("Delimiter", delimiter);