From 89882f24a0cea3507f8b4bbee5a2f66fef63a777 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 3 Oct 2023 15:23:49 -0400 Subject: [PATCH] rgw/sal: remove load_bucket() overload with tenant/name Signed-off-by: Casey Bodley --- src/rgw/driver/daos/rgw_sal_daos.cc | 12 ------------ src/rgw/driver/daos/rgw_sal_daos.h | 4 ---- src/rgw/driver/motr/rgw_sal_motr.cc | 10 ---------- src/rgw/driver/motr/rgw_sal_motr.h | 3 --- src/rgw/driver/posix/rgw_sal_posix.cc | 10 ---------- src/rgw/driver/posix/rgw_sal_posix.h | 3 --- src/rgw/driver/rados/rgw_sal_rados.cc | 12 ------------ src/rgw/driver/rados/rgw_sal_rados.h | 3 --- src/rgw/rgw_sal.h | 4 ---- src/rgw/rgw_sal_dbstore.cc | 12 ------------ src/rgw/rgw_sal_dbstore.h | 3 --- src/rgw/rgw_sal_filter.cc | 10 ---------- src/rgw/rgw_sal_filter.h | 7 ++----- 13 files changed, 2 insertions(+), 91 deletions(-) diff --git a/src/rgw/driver/daos/rgw_sal_daos.cc b/src/rgw/driver/daos/rgw_sal_daos.cc index 167c16d6be9..a6aacf024b3 100644 --- a/src/rgw/driver/daos/rgw_sal_daos.cc +++ b/src/rgw/driver/daos/rgw_sal_daos.cc @@ -2263,18 +2263,6 @@ int DaosStore::load_bucket(const DoutPrefixProvider* dpp, User* u, return (*bucket)->load_bucket(dpp, y); } -int DaosStore::load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) { - ldpp_dout(dpp, 20) << "get_bucket" << dendl; - rgw_bucket b; - - b.tenant = tenant; - b.name = name; - - return load_bucket(dpp, u, b, bucket, y); -} - bool DaosStore::is_meta_master() { return true; } int DaosStore::forward_request_to_master(const DoutPrefixProvider* dpp, diff --git a/src/rgw/driver/daos/rgw_sal_daos.h b/src/rgw/driver/daos/rgw_sal_daos.h index 23f723c0ce7..72d3bdb6cfb 100644 --- a/src/rgw/driver/daos/rgw_sal_daos.h +++ b/src/rgw/driver/daos/rgw_sal_daos.h @@ -899,10 +899,6 @@ class DaosStore : public StoreDriver { int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - int load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, - optional_yield y) override; virtual bool is_meta_master() override; virtual int forward_request_to_master(const DoutPrefixProvider* dpp, User* user, obj_version* objv, diff --git a/src/rgw/driver/motr/rgw_sal_motr.cc b/src/rgw/driver/motr/rgw_sal_motr.cc index c7e4fc49bd4..b53516bb065 100644 --- a/src/rgw/driver/motr/rgw_sal_motr.cc +++ b/src/rgw/driver/motr/rgw_sal_motr.cc @@ -3255,16 +3255,6 @@ int MotrStore::load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_buc return (*bucket)->load_bucket(dpp, y); } -int MotrStore::load_bucket(const DoutPrefixProvider *dpp, User* u, const std::string& tenant, const std::string& name, std::unique_ptr* bucket, optional_yield y) -{ - rgw_bucket b; - - b.tenant = tenant; - b.name = name; - - return load_bucket(dpp, u, b, bucket, y); -} - bool MotrStore::is_meta_master() { return true; diff --git a/src/rgw/driver/motr/rgw_sal_motr.h b/src/rgw/driver/motr/rgw_sal_motr.h index ec5eb347cf2..7935462ac3f 100644 --- a/src/rgw/driver/motr/rgw_sal_motr.h +++ b/src/rgw/driver/motr/rgw_sal_motr.h @@ -995,9 +995,6 @@ class MotrStore : public StoreDriver { std::unique_ptr get_bucket(User* u, const RGWBucketInfo& i) override; int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - int load_bucket(const DoutPrefixProvider *dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) override; virtual bool is_meta_master() override; virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv, bufferlist& in_data, JSONParser *jp, req_info& info, diff --git a/src/rgw/driver/posix/rgw_sal_posix.cc b/src/rgw/driver/posix/rgw_sal_posix.cc index 40f509b28d7..065d6d2d95d 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.cc +++ b/src/rgw/driver/posix/rgw_sal_posix.cc @@ -405,16 +405,6 @@ std::unique_ptr POSIXDriver::get_bucket(User* u, const RGWBucketInfo& i) return std::make_unique(this, root_fd, i, u); } -int POSIXDriver::load_bucket(const DoutPrefixProvider* dpp, User* u, const std::string& tenant, const std::string& name, std::unique_ptr* bucket, optional_yield y) -{ - rgw_bucket b; - - b.tenant = tenant; - b.name = name; - - return load_bucket(dpp, u, b, bucket, y); -} - std::string POSIXDriver::zone_unique_trans_id(const uint64_t unique_num) { char buf[41]; /* 2 + 21 + 1 + 16 (timestamp can consume up to 16) + 1 */ diff --git a/src/rgw/driver/posix/rgw_sal_posix.h b/src/rgw/driver/posix/rgw_sal_posix.h index 53cd05823b6..e132f240812 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.h +++ b/src/rgw/driver/posix/rgw_sal_posix.h @@ -56,9 +56,6 @@ public: virtual int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - virtual int load_bucket(const DoutPrefixProvider* dpp, User* u, const - std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) override; virtual std::string zone_unique_trans_id(const uint64_t unique_num) override; virtual std::unique_ptr get_append_writer(const DoutPrefixProvider *dpp, diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc index 2c526ec940d..328b4f82c8f 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.cc +++ b/src/rgw/driver/rados/rgw_sal_rados.cc @@ -1068,18 +1068,6 @@ int RadosStore::load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bu return (*bucket)->load_bucket(dpp, y); } -int RadosStore::load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) -{ - rgw_bucket b; - - b.tenant = tenant; - b.name = name; - - return load_bucket(dpp, u, b, bucket, y); -} - bool RadosStore::is_meta_master() { return svc()->zone->is_meta_master(); diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h index 84a0b6bf951..8c1926f3fbe 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.h +++ b/src/rgw/driver/rados/rgw_sal_rados.h @@ -140,9 +140,6 @@ class RadosStore : public StoreDriver { std::unique_ptr get_bucket(User* u, const RGWBucketInfo& i) override; int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - int load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) override; virtual bool is_meta_master() override; virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv, bufferlist& in_data, JSONParser* jp, req_info& info, diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index de5a2f7dda1..d6994253288 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -295,10 +295,6 @@ class Driver { * bucket must still be allocated to support bucket->create(). */ virtual int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) = 0; - /** Load a Bucket by name. Queries driver for bucket info. */ - virtual int load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) = 0; /** For multisite, this driver is the zone's master */ virtual bool is_meta_master() = 0; /** For multisite, forward an OP to the zone's master */ diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc index 7f9ad515ec2..792fa457f89 100644 --- a/src/rgw/rgw_sal_dbstore.cc +++ b/src/rgw/rgw_sal_dbstore.cc @@ -1646,18 +1646,6 @@ namespace rgw::sal { return (*bucket)->load_bucket(dpp, y); } - int DBStore::load_bucket(const DoutPrefixProvider *dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) - { - rgw_bucket b; - - b.tenant = tenant; - b.name = name; - - return load_bucket(dpp, u, b, bucket, y); - } - bool DBStore::is_meta_master() { return true; diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index e352af98b14..41a0b89ea50 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -781,9 +781,6 @@ public: std::unique_ptr get_bucket(User* u, const RGWBucketInfo& i) override; int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - int load_bucket(const DoutPrefixProvider *dpp, User* u, - const std::string& tenant, const std::string&name, - std::unique_ptr* bucket, optional_yield y) override; virtual bool is_meta_master() override; virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv, bufferlist& in_data, JSONParser *jp, req_info& info, diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc index fc5eecc008f..c70d9e372dc 100644 --- a/src/rgw/rgw_sal_filter.cc +++ b/src/rgw/rgw_sal_filter.cc @@ -174,16 +174,6 @@ int FilterDriver::load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_ return ret; } -int FilterDriver::load_bucket(const DoutPrefixProvider* dpp, User* u, - const std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) -{ - std::unique_ptr nb; - const int ret = next->load_bucket(dpp, nextUser(u), tenant, name, &nb, y); - *bucket = std::make_unique(std::move(nb), u); - return ret; -} - bool FilterDriver::is_meta_master() { return next->is_meta_master(); diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index e33c84871a7..b2aa1be399f 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -160,12 +160,9 @@ public: std::unique_ptr* user) override; virtual std::unique_ptr get_object(const rgw_obj_key& k) override; std::unique_ptr get_bucket(User* u, const RGWBucketInfo& i) override; - int load_bucket(const DoutPrefixProvider* dpp, User* u, const - rgw_bucket& b, std::unique_ptr* bucket, + int load_bucket(const DoutPrefixProvider* dpp, User* u, + const rgw_bucket& b, std::unique_ptr* bucket, optional_yield y) override; - int load_bucket(const DoutPrefixProvider* dpp, User* u, const - std::string& tenant, const std::string& name, - std::unique_ptr* bucket, optional_yield y) override; virtual bool is_meta_master() override; virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv, bufferlist& in_data, -- 2.39.5