From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 26 Jun 2017 11:28:21 +0000 (+0300)
Subject: rgw: fix next marker to pass test_bucket_list_prefix in s3test
X-Git-Tag: v12.1.1~128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8fff351d7607c6183b77acc29057c9d55b11f9de;p=ceph.git

rgw: fix next marker to pass test_bucket_list_prefix in s3test

Fixes: http://tracker.ceph.com/issues/19432
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index fcea5a13de2..4469f70b265 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -5628,10 +5628,10 @@ int RGWRados::Bucket::List::list_objects(int max, vector<rgw_bucket_dir_entry> *
               truncated = true;
               goto done;
             }
+            next_marker = prefix_key;
             (*common_prefixes)[prefix_key] = true;
 
             int marker_delim_pos = cur_marker.name.find(params.delim, cur_prefix.size());
-            next_marker = cur_marker.name.substr(0, marker_delim_pos + 1);
 
             skip_after_delim = cur_marker.name.substr(0, marker_delim_pos);
             skip_after_delim.append(bigger_than_delim);