Merge pull request ceph#62235 from cbodley/wip-70399

cls/rgw: non-versioned listings skip past version suffix

Reviewed-by: J. Eric Ivancich <[email protected]>

Author: cbodley

src/cls/rgw/cls_rgw.cc

@@ -364,6 +364,14 @@ static void get_list_index_key(rgw_bucket_dir_entry& entry, string *index_key)
   index_key->append(entry.key.instance);
 }
 
+// Format an omap key for an object name that sorts after all versioned keys
+// generated by get_list_index_key().
+static std::string cls_rgw_after_versions(const std::string& key)
+{
+  // assert: ! key.empty()
+  return key + '\1'; // suffix "\1" sorts after suffixes like "\0v123\0iabc"
+}
+
 static void encode_obj_versioned_data_key(const cls_rgw_obj_key& key, string *index_key, bool append_delete_marker_suffix = false)
 {
   *index_key = BI_PREFIX_CHAR;
@@ -528,8 +536,6 @@ static int read_bucket_header(cls_method_context_t hctx,
 
 int rgw_bucket_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 {
-  CLS_LOG(10, "entered %s", __func__);
-
   // maximum number of calls to get_obj_vals we'll try; compromise
   // between wanting to return the requested # of entries, but not
   // wanting to slow down this op with too many omap reads
@@ -545,6 +551,10 @@ int rgw_bucket_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
     return -EINVAL;
   }
 
+  CLS_LOG(10, "entered %s start=%s count=%u prefix=%s delim=%s versioned=%d",
+          __func__, op.start_obj.to_string().c_str(), op.num_entries,
+          op.filter_prefix.c_str(), op.delimiter.c_str(), (int)op.list_versions);
+
   rgw_cls_list_ret ret;
   rgw_bucket_dir& new_dir = ret.dir;
   auto& name_entry_map = new_dir.m; // map of keys to entries
@@ -652,6 +662,13 @@ int rgw_bucket_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 	  (!entry.is_visible() || op.start_obj.name == key.name)) {
         CLS_LOG(20, "%s: entry %s[%s] is not visible",
 		__func__, key.name.c_str(), key.instance.c_str());
+
+        // advance past any versioned entries for this name
+        start_after_omap_key = cls_rgw_after_versions(key.name);
+        start_after_entry_key.set(start_after_omap_key);
+
+        kiter = keys.lower_bound(start_after_omap_key);
+        --kiter;
         continue;
       }
 

src/rgw/driver/rados/rgw_rados.cc

@@ -1862,7 +1862,7 @@ int RGWRados::Bucket::List::list_objects_ordered(
     ldpp_dout(dpp, 20) << __func__ <<
       ": starting attempt " << attempt << dendl;
 
-    if (attempt > 1 && !(prev_marker < cur_marker)) {
+    if (attempt > 1 && prev_marker == cur_marker) {
       // we've failed to make forward progress
       ldpp_dout(dpp, 0) << "ERROR: " << __func__ <<
 	" marker failed to make forward progress; attempt=" << attempt <<