From: albIN7 <aantony@redhat.com>
Date: Wed, 3 Jul 2019 19:26:50 +0000 (+0530)
Subject: rgw: fix bugs in listobjectsv1
X-Git-Tag: v14.2.8~78^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a68ca7df1f78169fcecb54352fba0b5f29536dc5;p=ceph.git

rgw: fix bugs in listobjectsv1

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
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 4c2d9167efb2..05ff400324a4 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -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);