From 0014a99301524b791330e7bcfdd24cda8846a0b7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 15 Nov 2024 13:18:00 -0500 Subject: [PATCH] rgw/rados: remove unused RGWReshard::clear_bucket_resharding() Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_reshard.cc | 11 ----------- src/rgw/driver/rados/rgw_reshard.h | 1 - 2 files changed, 12 deletions(-) diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc index d4999b36198..82705602b36 100644 --- a/src/rgw/driver/rados/rgw_reshard.cc +++ b/src/rgw/driver/rados/rgw_reshard.cc @@ -1499,17 +1499,6 @@ int RGWReshard::remove(const DoutPrefixProvider *dpp, const cls_rgw_reshard_entr return ret; } -int RGWReshard::clear_bucket_resharding(const DoutPrefixProvider *dpp, const string& bucket_instance_oid, cls_rgw_reshard_entry& entry) -{ - int ret = cls_rgw_clear_bucket_resharding(store->getRados()->reshard_pool_ctx, bucket_instance_oid); - if (ret < 0) { - ldpp_dout(dpp, -1) << "ERROR: failed to clear bucket resharding, bucket_instance_oid=" << bucket_instance_oid << dendl; - return ret; - } - - return 0; -} - int RGWReshardWait::wait(const DoutPrefixProvider* dpp, optional_yield y) { std::unique_lock lock(mutex); diff --git a/src/rgw/driver/rados/rgw_reshard.h b/src/rgw/driver/rados/rgw_reshard.h index bdd7f678735..7a889318902 100644 --- a/src/rgw/driver/rados/rgw_reshard.h +++ b/src/rgw/driver/rados/rgw_reshard.h @@ -238,7 +238,6 @@ public: int get(const DoutPrefixProvider *dpp, cls_rgw_reshard_entry& entry); int remove(const DoutPrefixProvider *dpp, const cls_rgw_reshard_entry& entry, optional_yield y); int list(const DoutPrefixProvider *dpp, int logshard_num, std::string& marker, uint32_t max, std::list& entries, bool *is_truncated); - int clear_bucket_resharding(const DoutPrefixProvider *dpp, const std::string& bucket_instance_oid, cls_rgw_reshard_entry& entry); /* reshard thread */ int process_entry(const cls_rgw_reshard_entry& entry, int max_entries, -- 2.39.5