From f98089035385fbaabdfbfa4afd5ff5f4dda3cc0e Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 7 Nov 2024 19:04:53 -0500 Subject: [PATCH] rgw/rados: remove duplicated RGWRados::cls_bucket_head() Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_rados.cc | 30 ++---------------------------- src/rgw/driver/rados/rgw_rados.h | 5 ----- src/rgw/services/svc_bi_rados.h | 4 ++-- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index 3b1bbadda6558..09054e4b40115 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -9410,7 +9410,8 @@ int RGWRados::get_bucket_stats(const DoutPrefixProvider *dpp, { vector headers; map bucket_instance_ids; - int r = cls_bucket_head(dpp, bucket_info, idx_layout, shard_id, headers, &bucket_instance_ids); + int r = svc.bi_rados->cls_bucket_head(dpp, bucket_info, idx_layout, shard_id, + &headers, &bucket_instance_ids, y); if (r < 0) { return r; } @@ -10996,33 +10997,6 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, return 0; } // RGWRados::check_disk_state -int RGWRados::cls_bucket_head(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, vector& headers, map *bucket_instance_ids) -{ - librados::IoCtx index_pool; - map oids; - map list_results; - int r = svc.bi_rados->open_bucket_index(dpp, bucket_info, shard_id, idx_layout, &index_pool, &oids, bucket_instance_ids); - if (r < 0) { - ldpp_dout(dpp, 20) << "cls_bucket_head: open_bucket_index() returned " - << r << dendl; - return r; - } - - maybe_warn_about_blocking(dpp); // TODO: use AioTrottle - r = CLSRGWIssueGetDirHeader(index_pool, oids, list_results, cct->_conf->rgw_bucket_index_max_aio)(); - if (r < 0) { - ldpp_dout(dpp, 20) << "cls_bucket_head: CLSRGWIssueGetDirHeader() returned " - << r << dendl; - return r; - } - - map::iterator iter = list_results.begin(); - for(; iter != list_results.end(); ++iter) { - headers.push_back(std::move(iter->second.dir.header)); - } - return 0; -} - int RGWRados::cls_bucket_head_async(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, boost::intrusive_ptr cb, int *num_aio) diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index 9afe35be4c329..13fde2926055f 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -1535,11 +1535,6 @@ public: rgw_obj_index_key *last_entry, optional_yield y, RGWBucketListNameFilter force_check_filter = {}); - int cls_bucket_head(const DoutPrefixProvider *dpp, - const RGWBucketInfo& bucket_info, - const rgw::bucket_index_layout_generation& idx_layout, - int shard_id, std::vector& headers, - std::map *bucket_instance_ids = NULL); int cls_bucket_head_async(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, diff --git a/src/rgw/services/svc_bi_rados.h b/src/rgw/services/svc_bi_rados.h index a4ecd8cd7f074..ba9aee88ff868 100644 --- a/src/rgw/services/svc_bi_rados.h +++ b/src/rgw/services/svc_bi_rados.h @@ -66,6 +66,8 @@ class RGWSI_BucketIndex_RADOS : public RGWSI_BucketIndex uint64_t gen_id, const std::string& obj_key, std::string* bucket_obj, int* shard_id); +public: + int cls_bucket_head(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, @@ -74,8 +76,6 @@ class RGWSI_BucketIndex_RADOS : public RGWSI_BucketIndex std::map *bucket_instance_ids, optional_yield y); -public: - librados::Rados* rados{nullptr}; struct Svc { -- 2.39.5