rgw/sal: remove forward-to-master functions from Driver

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 8be268fe17ccad94c626e947767f8ea809277de2..1bade375203290c5d59e8ba18c057e6335437ba3 100644 (file)
--- a/src/rgw/driver/daos/rgw_sal_daos.cc
+++ b/src/rgw/driver/daos/rgw_sal_daos.cc
@@ -2252,22 +2252,6 @@ int DaosStore::load_bucket(const DoutPrefixProvider* dpp, User* u,
 
 bool DaosStore::is_meta_master() { return true; }
 
-int DaosStore::forward_request_to_master(const DoutPrefixProvider* dpp,
-                                         User* user, obj_version* objv,
-                                         bufferlist& in_data, JSONParser* jp,
-                                         req_info& info, optional_yield y) {
-  return DAOS_NOT_IMPLEMENTED_LOG(dpp);
-}
-
-int DaosStore::forward_iam_request_to_master(const DoutPrefixProvider* dpp,
-                                             const RGWAccessKey& key,
-                                             obj_version* objv,
-                                             bufferlist& in_data,
-                                             RGWXMLDecoder::XMLParser* parser,
-                                             req_info& info, optional_yield y) {
-  return DAOS_NOT_IMPLEMENTED_LOG(dpp);
-}
-
 std::string DaosStore::zone_unique_id(uint64_t unique_num) { return ""; }
 
 std::string DaosStore::zone_unique_trans_id(const uint64_t unique_num) {

diff --git a/src/rgw/driver/daos/rgw_sal_daos.h b/src/rgw/driver/daos/rgw_sal_daos.h
index 4d5e6c831079de05bab6be463d60c19e790798eb..8394fb2f7570900c03e8564239fa8ac7525d429a 100644 (file)
--- a/src/rgw/driver/daos/rgw_sal_daos.h
+++ b/src/rgw/driver/daos/rgw_sal_daos.h
@@ -898,15 +898,6 @@ class DaosStore : public StoreDriver {
                   const rgw_bucket& b, 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,
-                                        optional_yield y) override;
-  virtual int forward_iam_request_to_master(
-      const DoutPrefixProvider* dpp, const RGWAccessKey& key, obj_version* objv,
-      bufferlist& in_data, RGWXMLDecoder::XMLParser* parser, req_info& info,
-      optional_yield y) override;
   virtual Zone* get_zone() { return &zone; }
   virtual std::string zone_unique_id(uint64_t unique_num) override;
   virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

diff --git a/src/rgw/driver/motr/rgw_sal_motr.cc b/src/rgw/driver/motr/rgw_sal_motr.cc
index d6a5eb1bc3ed79892d92752233776b13c7f12289..1e110ae73a3c6884b6913d8baeeb7f8c670f5aa7 100644 (file)
--- a/src/rgw/driver/motr/rgw_sal_motr.cc
+++ b/src/rgw/driver/motr/rgw_sal_motr.cc
@@ -3246,22 +3246,6 @@ bool MotrStore::is_meta_master()
   return true;
 }
 
-int MotrStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version *objv,
-    bufferlist& in_data,
-    JSONParser *jp, req_info& info,
-    optional_yield y)
-{
-  return 0;
-}
-
-int MotrStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y)
-{
-    return 0;
-}
-
 std::string MotrStore::zone_unique_id(uint64_t unique_num)
 {
   return "";

diff --git a/src/rgw/driver/motr/rgw_sal_motr.h b/src/rgw/driver/motr/rgw_sal_motr.h
index 66ca8314fc0bc3a3bfc09f4ef47db1ebe9471456..92ddc9a115f2c8a16745390312cbb3b55d1621f1 100644 (file)
--- a/src/rgw/driver/motr/rgw_sal_motr.h
+++ b/src/rgw/driver/motr/rgw_sal_motr.h
@@ -994,13 +994,6 @@ class MotrStore : public StoreDriver {
     int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
                     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,
-        optional_yield y) override;
-    virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y) override;
     virtual Zone* get_zone() { return &zone; }
     virtual std::string zone_unique_id(uint64_t unique_num) override;
     virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc
index 68b6d998eca4d3147eeec314fcc5dafc1edc227c..f96378ada012aca70d71c5162a04d46309eb2700 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.cc
+++ b/src/rgw/driver/rados/rgw_sal_rados.cc
@@ -1005,78 +1005,6 @@ bool RadosStore::is_meta_master()
   return svc()->zone->is_meta_master();
 }
 
-int RadosStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
-                                            bufferlist& in_data,
-                                            JSONParser* jp, req_info& info,
-                                            optional_yield y)
-{
-  if (is_meta_master()) {
-    /* We're master, don't forward */
-    return 0;
-  }
-
-  if (!svc()->zone->get_master_conn()) {
-    ldpp_dout(dpp, 0) << "rest connection is invalid" << dendl;
-    return -EINVAL;
-  }
-  ldpp_dout(dpp, 0) << "sending request to master zonegroup" << dendl;
-  bufferlist response;
-  std::string uid_str = user->get_id().to_str();
-#define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response
-  int ret = svc()->zone->get_master_conn()->forward(dpp, rgw_user(uid_str), info,
-                                                    objv, MAX_REST_RESPONSE,
-                                                   &in_data, &response, y);
-  if (ret < 0)
-    return ret;
-
-  ldpp_dout(dpp, 20) << "response: " << response.c_str() << dendl;
-  if (jp && !jp->parse(response.c_str(), response.length())) {
-    ldpp_dout(dpp, 0) << "failed parsing response from master zonegroup" << dendl;
-    return -EINVAL;
-  }
-
-  return 0;
-}
-
-int RadosStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y)
-{
-  if (is_meta_master()) {
-    /* We're master, don't forward */
-    return 0;
-  }
-
-  if (!svc()->zone->get_master_conn()) {
-    ldpp_dout(dpp, 0) << "rest connection is invalid" << dendl;
-    return -EINVAL;
-  }
-  ldpp_dout(dpp, 0) << "sending request to master zonegroup" << dendl;
-  bufferlist response;
-#define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response
-  int ret = svc()->zone->get_master_conn()->forward_iam_request(dpp, key, info,
-                                                    objv, MAX_REST_RESPONSE,
-                                                                                       &in_data, &response, y);
-  if (ret < 0)
-    return ret;
-
-  ldpp_dout(dpp, 20) << "response: " << response.c_str() << dendl;
-
-  std::string r = response.c_str();
-  std::string str_to_search = "&quot;";
-  std::string str_to_replace = "\"";
-  boost::replace_all(r, str_to_search, str_to_replace);
-  ldpp_dout(dpp, 20) << "r: " << r.c_str() << dendl;
-
-  if (parser && !parser->parse(r.c_str(), r.length(), 1)) {
-    ldpp_dout(dpp, 0) << "ERROR: failed to parse response from master zonegroup" << dendl;
-    return -EIO;
-  }
-
-  return 0;
-}
-
 std::string RadosStore::zone_unique_id(uint64_t unique_num)
 {
   return svc()->zone_utils->unique_id(unique_num);

diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h
index c46ba8e68f0bcbb1ef05d4e9db6cf5d998e744bd..0ad6e8fa083ab723344e665e2462eaf5a7f10842 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.h
+++ b/src/rgw/driver/rados/rgw_sal_rados.h
@@ -139,13 +139,6 @@ class RadosStore : public StoreDriver {
     int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b,
                     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,
-                                         optional_yield y) override;
-    virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y) override;
     virtual Zone* get_zone() { return zone.get(); }
     virtual std::string zone_unique_id(uint64_t unique_num) override;
     virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index a4b0219dd41122bdc71c1c5f8958dd28c8bf7cfc..1019f48dab464a7198788c7ab716c0517fdb849a 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -298,14 +298,6 @@ class Driver {
                             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 */
-    virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
-                                         bufferlist& in_data, JSONParser* jp, req_info& info,
-                                         optional_yield y) = 0;
-    virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y) = 0;
     /** Get zone info for this driver */
     virtual Zone* get_zone() = 0;
     /** Get a unique ID specific to this zone. */

diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index 47fa0f06ba750753795168b64c87b7ea2bbafd65..bce27b912d8f87f1b440d906d258984de3f97cf6 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -1570,22 +1570,6 @@ namespace rgw::sal {
     return true;
   }
 
-  int DBStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version *objv,
-      bufferlist& in_data,
-      JSONParser *jp, req_info& info,
-      optional_yield y)
-  {
-    return 0;
-  }
-
-  int DBStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y)
-  {
-      return 0;
-  }
-
   std::string DBStore::zone_unique_id(uint64_t unique_num)
   {
     return "";

diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h
index 7ab98f6286b4b969a777044a51dec1ae81f382d7..bd359d038a280c83a705f22275889a270b64bb68 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.h
+++ b/src/rgw/rgw_sal_dbstore.h
@@ -767,13 +767,6 @@ public:
       int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
                       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,
-          optional_yield y) override;
-      virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
-                                            bufferlist& in_data,
-                                            RGWXMLDecoder::XMLParser* parser, req_info& info,
-                                            optional_yield y) override;
       virtual Zone* get_zone() { return &zone; }
       virtual std::string zone_unique_id(uint64_t unique_num) override;
       virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc
index 01a11351367268d5ad22df959e04e2aa6d48994f..b27f1123995e03bc115434837f7dee0b43530f00 100644 (file)
--- a/src/rgw/rgw_sal_filter.cc
+++ b/src/rgw/rgw_sal_filter.cc
@@ -179,26 +179,6 @@ bool FilterDriver::is_meta_master()
   return next->is_meta_master();
 }
 
-int FilterDriver::forward_request_to_master(const DoutPrefixProvider *dpp,
-                                          User* user, obj_version* objv,
-                                          bufferlist& in_data,
-                                          JSONParser* jp, req_info& info,
-                                          optional_yield y)
-{
-  return next->forward_request_to_master(dpp, user, objv, in_data, jp, info, y);
-}
-
-int FilterDriver::forward_iam_request_to_master(const DoutPrefixProvider *dpp,
-                                              const RGWAccessKey& key,
-                                              obj_version* objv,
-                                              bufferlist& in_data,
-                                              RGWXMLDecoder::XMLParser* parser,
-                                              req_info& info,
-                                              optional_yield y)
-{
-  return next->forward_iam_request_to_master(dpp, key, objv, in_data, parser, info, y);
-}
-
 std::string FilterDriver::zone_unique_id(uint64_t unique_num)
 {
   return next->zone_unique_id(unique_num);

diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h
index aec8cd64c2ca7bdfecb4769de53145ff09aef5e1..8ca3a470e448b1176a558e5bfcffbd0584bed6c5 100644 (file)
--- a/src/rgw/rgw_sal_filter.h
+++ b/src/rgw/rgw_sal_filter.h
@@ -162,17 +162,6 @@ public:
                   const rgw_bucket& b, 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,
-                                       optional_yield y) override;
-  virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp,
-                                           const RGWAccessKey& key,
-                                           obj_version* objv,
-                                           bufferlist& in_data,
-                                           RGWXMLDecoder::XMLParser* parser,
-                                           req_info& info,
-                                           optional_yield y) override;
   virtual Zone* get_zone() override { return zone.get(); }
   virtual std::string zone_unique_id(uint64_t unique_num) override;
   virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;