]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: always generate after delimiter char to skip directory
authorTianshan Qu <tianshan@xsky.com>
Tue, 11 Jun 2019 04:27:12 +0000 (12:27 +0800)
committerTianshan Qu <tianshan@xsky.com>
Tue, 11 Jun 2019 04:27:12 +0000 (12:27 +0800)
the following code also need after_delim_s to skip directory after list
1000 objects

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
src/rgw/rgw_rados.cc

index 7487b68be7153b65f260bb75b113c65a7e8e0a27..231772285b6c74c44751725aa924fbc6663e7385 100644 (file)
@@ -2435,12 +2435,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;
     }