From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Mon, 30 Sep 2024 18:03:53 +0000 (-0400)
Subject: Merge pull request #59998 from cbodley/wip-63935
X-Git-Tag: v20.0.0~934
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=859dc27342a54136cd15380f83bf4ff889ba65b5;p=ceph.git

Merge pull request #59998 from cbodley/wip-63935

rgw/rados: don't rely on IoCtx::get_last_version() for async ops

Reviewed-by: Adam Emerson <aemerson@redhat.com>
---

859dc27342a54136cd15380f83bf4ff889ba65b5
diff --cc src/rgw/driver/rados/rgw_rados.cc
index 99751be392f,45d74a6ec24..5dc0663ec76
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@@ -9662,9 -9650,14 +9657,15 @@@ int RGWRados::cls_bucket_list_ordered(c
      num_entries << " total entries" << dendl;
  
    auto& ioctx = index_pool;
+ 
+   // XXX: check_disk_state() relies on ioctx.get_last_version() but that
+   // returns 0 because CLSRGWIssueBucketList doesn't make any synchonous calls
+   rgw_bucket_entry_ver index_ver;
+   index_ver.pool = ioctx.get_id();
+ 
    std::map<int, rgw_cls_list_ret> shard_list_results;
    cls_rgw_obj_key start_after_key(start_after.name, start_after.instance);
 +  maybe_warn_about_blocking(dpp); // TODO: use AioTrottle
    r = CLSRGWIssueBucketList(ioctx, start_after_key, prefix, delimiter,
  			    num_entries_per_shard,
  			    list_versions, shard_oids, shard_list_results,