rgw/sal: remove load_bucket() overload with tenant/name

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/driver/daos/rgw_sal_daos.cc b/src/rgw/driver/daos/rgw_sal_daos.cc
index 167c16d6be97b8501bf060ddfb129d391487e1fa..a6aacf024b3157e8f758346420283d70408a01b4 100644 (file)
--- 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>* 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 23f723c0ce7c6fc9399b60b3f60bcc7031d7f0ef..72d3bdb6cfbe1708e4a9ed7bb105a38c096d8240 100644 (file)
--- 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>* 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>* 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 c7e4fc49bd4891294ad7a02c80f88f8fff274123..b53516bb0653cf3218435772ab1ad7c01660e39b 100644 (file)
--- 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>* 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 ec5eb347cf22733fd73923edd57bf84a2b28b4e7..7935462ac3f0daa9332f91044ae2f3c29f5acb23 100644 (file)
--- 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<Bucket> get_bucket(User* u, const RGWBucketInfo& i) override;
     int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
                     std::unique_ptr<Bucket>* 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>* 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 40f509b28d74beeb894aca946eb5a1683371e8f1..065d6d2d95dbc914a405d65a0fb88ee2dbc8e671 100644 (file)
--- 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<Bucket> POSIXDriver::get_bucket(User* u, const RGWBucketInfo& i)
   return std::make_unique<POSIXBucket>(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>* 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 53cd05823b6c7c4ad6b5791c0a0f09379f63a0a0..e132f240812bea7160475ea24320e61c63d141d6 100644 (file)
--- 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>* 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>* bucket, optional_yield y) override;
   virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;
 
   virtual std::unique_ptr<Writer> 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 2c526ec940d2877c0f2f33a289a4b1f59c5a7ae4..328b4f82c8f21548b71e0b8380cf007b3f9a314a 100644 (file)
--- 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>* 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 84a0b6bf95139f999541a088b7cd6a9e40980277..8c1926f3fbef46642366bcc951796fba5cef1739 100644 (file)
--- 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<Bucket> get_bucket(User* u, const RGWBucketInfo& i) override;
     int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b,
                     std::unique_ptr<Bucket>* 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>* 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 de5a2f7dda13ef4d12f918c462f54a7edfe8be65..d69942532881cab817c4038c444070bc5f13a23f 100644 (file)
--- 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>* 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>* 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 7f9ad515ec2159edf2633b82ead29e7b87fc317d..792fa457f895274dbdd891a4b76aefbf71c5c23f 100644 (file)
--- 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>* 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 e352af98b14348bd3948220a62f63e6dd3193ca9..41a0b89ea50296153abd23c8beec73b6db6c0f50 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.h
+++ b/src/rgw/rgw_sal_dbstore.h
@@ -781,9 +781,6 @@ public:
       std::unique_ptr<Bucket> get_bucket(User* u, const RGWBucketInfo& i) override;
       int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
                       std::unique_ptr<Bucket>* 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>* 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 fc5eecc008fd26981f163a822cda73f38385705d..c70d9e372dc306e61f7ecc971d3fff0e4cfa778c 100644 (file)
--- 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>* bucket, optional_yield y)
-{
-  std::unique_ptr<Bucket> nb;
-  const int ret = next->load_bucket(dpp, nextUser(u), tenant, name, &nb, y);
-  *bucket = std::make_unique<FilterBucket>(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 e33c84871a7ac4d08844ecd6460c298de2ec2992..b2aa1be399f3f9d98a9f8107d2ac028de1d6e548 100644 (file)
--- a/src/rgw/rgw_sal_filter.h
+++ b/src/rgw/rgw_sal_filter.h
@@ -160,12 +160,9 @@ public:
                                std::unique_ptr<User>* user) override;
   virtual std::unique_ptr<Object> get_object(const rgw_obj_key& k) override;
   std::unique_ptr<Bucket> get_bucket(User* u, const RGWBucketInfo& i) override;
-  int load_bucket(const DoutPrefixProvider* dpp, User* u, const
-                  rgw_bucket& b, std::unique_ptr<Bucket>* bucket,
+  int load_bucket(const DoutPrefixProvider* dpp, User* u,
+                  const rgw_bucket& b, std::unique_ptr<Bucket>* 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>* 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,