]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #59998 from cbodley/wip-63935
authorCasey Bodley <cbodley@users.noreply.github.com>
Mon, 30 Sep 2024 18:03:53 +0000 (14:03 -0400)
committerGitHub <noreply@github.com>
Mon, 30 Sep 2024 18:03:53 +0000 (14:03 -0400)
rgw/rados: don't rely on IoCtx::get_last_version() for async ops

Reviewed-by: Adam Emerson <aemerson@redhat.com>
1  2 
src/rgw/driver/rados/rgw_rados.cc

index 99751be392f6cfe105bae3933f3964f0b2d046be,45d74a6ec24b4ffc739e75273fbfc771a4ac744c..5dc0663ec76308e9cd22ba25f4786c094fea7717
@@@ -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,