]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: always generate after delimiter char to skip directory 29022/head
authorTianshan Qu <tianshan@xsky.com>
Tue, 11 Jun 2019 04:27:12 +0000 (12:27 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 12 Jul 2019 15:12:30 +0000 (17:12 +0200)
the following code also need after_delim_s to skip directory after list
1000 objects

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 8c6678387b00c862d71cffd6fed6ca6c236e3fb7)

src/rgw/rgw_rados.cc

index ff7e5ac094280a3454b522e91bf1c12759800ad9..ff491b40ff915973d0ab2107f1e67d5d199b885b 100644 (file)
@@ -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;
     }