From: Tianshan Qu Date: Tue, 11 Jun 2019 04:27:12 +0000 (+0800) Subject: rgw: always generate after delimiter char to skip directory X-Git-Tag: v14.2.2~5^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29022%2Fhead;p=ceph.git rgw: always generate after delimiter char to skip directory the following code also need after_delim_s to skip directory after list 1000 objects Signed-off-by: Tianshan Qu (cherry picked from commit 8c6678387b00c862d71cffd6fed6ca6c236e3fb7) --- diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ff7e5ac09428..ff491b40ff91 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2473,12 +2473,12 @@ int RGWRados::Bucket::List::list_objects_ordered( string after_delim_s; /* needed in !params.delim.empty() AND later */ if (!params.delim.empty()) { + after_delim_s = after_delim(params.delim); /* if marker points at a common prefix, fast forward it into its * upper bound string */ int delim_pos = cur_marker.name.find(params.delim, cur_prefix.size()); if (delim_pos >= 0) { string s = cur_marker.name.substr(0, delim_pos); - after_delim_s = after_delim(params.delim); s.append(after_delim_s); cur_marker = s; }