From a68ca7df1f78169fcecb54352fba0b5f29536dc5 Mon Sep 17 00:00:00 2001 From: albIN7 Date: Thu, 4 Jul 2019 00:56:50 +0530 Subject: [PATCH] rgw: fix bugs in listobjectsv1 Fixes: https://tracker.ceph.com/issues/40663 Signed-off-by: Albin Antony (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 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 4c2d9167efb..05ff400324a 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); -- 2.47.3