]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix next marker to pass test_bucket_list_prefix in s3test 15916/head
authorOrit Wasserman <owasserm@redhat.com>
Mon, 26 Jun 2017 11:28:21 +0000 (14:28 +0300)
committerOrit Wasserman <owasserm@redhat.com>
Mon, 26 Jun 2017 11:29:08 +0000 (14:29 +0300)
Fixes: http://tracker.ceph.com/issues/19432
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_rados.cc

index fcea5a13de28b94c30a42cc995bd31816621b9c4..4469f70b265364f78711657de26f7f7df3831753 100644 (file)
@@ -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);