Skip to content

Commit e93b6bb

Browse files
cbodleycbodley
committed
rgw/sal: remove forward-to-master functions from Driver
Signed-off-by: Casey Bodley <[email protected]>
1 parent d3ad0ef commit e93b6bb

File tree

11 files changed

+0
-189
lines changed

11 files changed

+0
-189
lines changed

‎src/rgw/driver/daos/rgw_sal_daos.cc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,22 +2252,6 @@ int DaosStore::load_bucket(const DoutPrefixProvider* dpp, User* u,
22522252

22532253
bool DaosStore::is_meta_master() { return true; }
22542254

2255-
int DaosStore::forward_request_to_master(const DoutPrefixProvider* dpp,
2256-
User* user, obj_version* objv,
2257-
bufferlist& in_data, JSONParser* jp,
2258-
req_info& info, optional_yield y) {
2259-
return DAOS_NOT_IMPLEMENTED_LOG(dpp);
2260-
}
2261-
2262-
int DaosStore::forward_iam_request_to_master(const DoutPrefixProvider* dpp,
2263-
const RGWAccessKey& key,
2264-
obj_version* objv,
2265-
bufferlist& in_data,
2266-
RGWXMLDecoder::XMLParser* parser,
2267-
req_info& info, optional_yield y) {
2268-
return DAOS_NOT_IMPLEMENTED_LOG(dpp);
2269-
}
2270-
22712255
std::string DaosStore::zone_unique_id(uint64_t unique_num) { return ""; }
22722256

22732257
std::string DaosStore::zone_unique_trans_id(const uint64_t unique_num) {

‎src/rgw/driver/daos/rgw_sal_daos.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -898,15 +898,6 @@ class DaosStore : public StoreDriver {
898898
const rgw_bucket& b, std::unique_ptr<Bucket>* bucket,
899899
optional_yield y) override;
900900
virtual bool is_meta_master() override;
901-
virtual int forward_request_to_master(const DoutPrefixProvider* dpp,
902-
User* user, obj_version* objv,
903-
bufferlist& in_data, JSONParser* jp,
904-
req_info& info,
905-
optional_yield y) override;
906-
virtual int forward_iam_request_to_master(
907-
const DoutPrefixProvider* dpp, const RGWAccessKey& key, obj_version* objv,
908-
bufferlist& in_data, RGWXMLDecoder::XMLParser* parser, req_info& info,
909-
optional_yield y) override;
910901
virtual Zone* get_zone() { return &zone; }
911902
virtual std::string zone_unique_id(uint64_t unique_num) override;
912903
virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

‎src/rgw/driver/motr/rgw_sal_motr.cc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3246,22 +3246,6 @@ bool MotrStore::is_meta_master()
32463246
return true;
32473247
}
32483248

3249-
int MotrStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version *objv,
3250-
bufferlist& in_data,
3251-
JSONParser *jp, req_info& info,
3252-
optional_yield y)
3253-
{
3254-
return 0;
3255-
}
3256-
3257-
int MotrStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
3258-
bufferlist& in_data,
3259-
RGWXMLDecoder::XMLParser* parser, req_info& info,
3260-
optional_yield y)
3261-
{
3262-
return 0;
3263-
}
3264-
32653249
std::string MotrStore::zone_unique_id(uint64_t unique_num)
32663250
{
32673251
return "";

‎src/rgw/driver/motr/rgw_sal_motr.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -994,13 +994,6 @@ class MotrStore : public StoreDriver {
994994
int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
995995
std::unique_ptr<Bucket>* bucket, optional_yield y) override;
996996
virtual bool is_meta_master() override;
997-
virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
998-
bufferlist& in_data, JSONParser *jp, req_info& info,
999-
optional_yield y) override;
1000-
virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
1001-
bufferlist& in_data,
1002-
RGWXMLDecoder::XMLParser* parser, req_info& info,
1003-
optional_yield y) override;
1004997
virtual Zone* get_zone() { return &zone; }
1005998
virtual std::string zone_unique_id(uint64_t unique_num) override;
1006999
virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

‎src/rgw/driver/rados/rgw_sal_rados.cc‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,78 +1005,6 @@ bool RadosStore::is_meta_master()
10051005
return svc()->zone->is_meta_master();
10061006
}
10071007

1008-
int RadosStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
1009-
bufferlist& in_data,
1010-
JSONParser* jp, req_info& info,
1011-
optional_yield y)
1012-
{
1013-
if (is_meta_master()) {
1014-
/* We're master, don't forward */
1015-
return 0;
1016-
}
1017-
1018-
if (!svc()->zone->get_master_conn()) {
1019-
ldpp_dout(dpp, 0) << "rest connection is invalid" << dendl;
1020-
return -EINVAL;
1021-
}
1022-
ldpp_dout(dpp, 0) << "sending request to master zonegroup" << dendl;
1023-
bufferlist response;
1024-
std::string uid_str = user->get_id().to_str();
1025-
#define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response
1026-
int ret = svc()->zone->get_master_conn()->forward(dpp, rgw_user(uid_str), info,
1027-
objv, MAX_REST_RESPONSE,
1028-
&in_data, &response, y);
1029-
if (ret < 0)
1030-
return ret;
1031-
1032-
ldpp_dout(dpp, 20) << "response: " << response.c_str() << dendl;
1033-
if (jp && !jp->parse(response.c_str(), response.length())) {
1034-
ldpp_dout(dpp, 0) << "failed parsing response from master zonegroup" << dendl;
1035-
return -EINVAL;
1036-
}
1037-
1038-
return 0;
1039-
}
1040-
1041-
int RadosStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
1042-
bufferlist& in_data,
1043-
RGWXMLDecoder::XMLParser* parser, req_info& info,
1044-
optional_yield y)
1045-
{
1046-
if (is_meta_master()) {
1047-
/* We're master, don't forward */
1048-
return 0;
1049-
}
1050-
1051-
if (!svc()->zone->get_master_conn()) {
1052-
ldpp_dout(dpp, 0) << "rest connection is invalid" << dendl;
1053-
return -EINVAL;
1054-
}
1055-
ldpp_dout(dpp, 0) << "sending request to master zonegroup" << dendl;
1056-
bufferlist response;
1057-
#define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response
1058-
int ret = svc()->zone->get_master_conn()->forward_iam_request(dpp, key, info,
1059-
objv, MAX_REST_RESPONSE,
1060-
&in_data, &response, y);
1061-
if (ret < 0)
1062-
return ret;
1063-
1064-
ldpp_dout(dpp, 20) << "response: " << response.c_str() << dendl;
1065-
1066-
std::string r = response.c_str();
1067-
std::string str_to_search = "&quot;";
1068-
std::string str_to_replace = "\"";
1069-
boost::replace_all(r, str_to_search, str_to_replace);
1070-
ldpp_dout(dpp, 20) << "r: " << r.c_str() << dendl;
1071-
1072-
if (parser && !parser->parse(r.c_str(), r.length(), 1)) {
1073-
ldpp_dout(dpp, 0) << "ERROR: failed to parse response from master zonegroup" << dendl;
1074-
return -EIO;
1075-
}
1076-
1077-
return 0;
1078-
}
1079-
10801008
std::string RadosStore::zone_unique_id(uint64_t unique_num)
10811009
{
10821010
return svc()->zone_utils->unique_id(unique_num);

‎src/rgw/driver/rados/rgw_sal_rados.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,6 @@ class RadosStore : public StoreDriver {
139139
int load_bucket(const DoutPrefixProvider* dpp, User* u, const rgw_bucket& b,
140140
std::unique_ptr<Bucket>* bucket, optional_yield y) override;
141141
virtual bool is_meta_master() override;
142-
virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
143-
bufferlist& in_data, JSONParser* jp, req_info& info,
144-
optional_yield y) override;
145-
virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
146-
bufferlist& in_data,
147-
RGWXMLDecoder::XMLParser* parser, req_info& info,
148-
optional_yield y) override;
149142
virtual Zone* get_zone() { return zone.get(); }
150143
virtual std::string zone_unique_id(uint64_t unique_num) override;
151144
virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

‎src/rgw/rgw_sal.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,6 @@ class Driver {
298298
std::unique_ptr<Bucket>* bucket, optional_yield y) = 0;
299299
/** For multisite, this driver is the zone's master */
300300
virtual bool is_meta_master() = 0;
301-
/** For multisite, forward an OP to the zone's master */
302-
virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
303-
bufferlist& in_data, JSONParser* jp, req_info& info,
304-
optional_yield y) = 0;
305-
virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
306-
bufferlist& in_data,
307-
RGWXMLDecoder::XMLParser* parser, req_info& info,
308-
optional_yield y) = 0;
309301
/** Get zone info for this driver */
310302
virtual Zone* get_zone() = 0;
311303
/** Get a unique ID specific to this zone. */

‎src/rgw/rgw_sal_dbstore.cc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,22 +1570,6 @@ namespace rgw::sal {
15701570
return true;
15711571
}
15721572

1573-
int DBStore::forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version *objv,
1574-
bufferlist& in_data,
1575-
JSONParser *jp, req_info& info,
1576-
optional_yield y)
1577-
{
1578-
return 0;
1579-
}
1580-
1581-
int DBStore::forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
1582-
bufferlist& in_data,
1583-
RGWXMLDecoder::XMLParser* parser, req_info& info,
1584-
optional_yield y)
1585-
{
1586-
return 0;
1587-
}
1588-
15891573
std::string DBStore::zone_unique_id(uint64_t unique_num)
15901574
{
15911575
return "";

‎src/rgw/rgw_sal_dbstore.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -767,13 +767,6 @@ class DBNotification : public StoreNotification {
767767
int load_bucket(const DoutPrefixProvider *dpp, User* u, const rgw_bucket& b,
768768
std::unique_ptr<Bucket>* bucket, optional_yield y) override;
769769
virtual bool is_meta_master() override;
770-
virtual int forward_request_to_master(const DoutPrefixProvider *dpp, User* user, obj_version* objv,
771-
bufferlist& in_data, JSONParser *jp, req_info& info,
772-
optional_yield y) override;
773-
virtual int forward_iam_request_to_master(const DoutPrefixProvider *dpp, const RGWAccessKey& key, obj_version* objv,
774-
bufferlist& in_data,
775-
RGWXMLDecoder::XMLParser* parser, req_info& info,
776-
optional_yield y) override;
777770
virtual Zone* get_zone() { return &zone; }
778771
virtual std::string zone_unique_id(uint64_t unique_num) override;
779772
virtual std::string zone_unique_trans_id(const uint64_t unique_num) override;

‎src/rgw/rgw_sal_filter.cc‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,6 @@ bool FilterDriver::is_meta_master()
179179
return next->is_meta_master();
180180
}
181181

182-
int FilterDriver::forward_request_to_master(const DoutPrefixProvider *dpp,
183-
User* user, obj_version* objv,
184-
bufferlist& in_data,
185-
JSONParser* jp, req_info& info,
186-
optional_yield y)
187-
{
188-
return next->forward_request_to_master(dpp, user, objv, in_data, jp, info, y);
189-
}
190-
191-
int FilterDriver::forward_iam_request_to_master(const DoutPrefixProvider *dpp,
192-
const RGWAccessKey& key,
193-
obj_version* objv,
194-
bufferlist& in_data,
195-
RGWXMLDecoder::XMLParser* parser,
196-
req_info& info,
197-
optional_yield y)
198-
{
199-
return next->forward_iam_request_to_master(dpp, key, objv, in_data, parser, info, y);
200-
}
201-
202182
std::string FilterDriver::zone_unique_id(uint64_t unique_num)
203183
{
204184
return next->zone_unique_id(unique_num);

0 commit comments

Comments
 (0)