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

rgw: fix bugs in listobjectsv1

Fixes: https://tracker.ceph.com/issues/40663

Signed-off-by: Albin Antony <aantony@redhat.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index bce2ca945769..4cc7db32f5c8 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -839,21 +839,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);
-    if (next_marker.instance.empty())
-      s->formatter->dump_string("NextVersionIdMarker", "null");  
-    else
-      s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
-  }
   s->formatter->dump_int("MaxKeys", max);
   if (!delimiter.empty()) {
     s->formatter->dump_string("Delimiter", delimiter);
@@ -889,7 +879,6 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
       s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
     }
   }
-
   bool encode_key = false;
   if (strcasecmp(encoding_type.c_str(), "url") == 0) {
     s->formatter->dump_string("EncodingType", "url");
@@ -947,11 +936,10 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
       }
       s->formatter->close_section();
     }
-
-  s->formatter->close_section();
+    s->formatter->close_section();
+  }
   rgw_flush_formatter_and_reset(s, s->formatter);
 }
-}
 
 
 void RGWListBucket_ObjStore_S3::send_common_response()