RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 14:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

radosgw-admin: send_to_remote_gateway takes RGWRESTConn*

Browse Source 
callers are responsible for providing their own remote connection

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-04-08 13:10:38 -04:00
parent f527342a8d
commit 416b41acea
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/rgw/rgw_admin.cc
View File

@ -1547,31 +1547,10 @@ static boost::optional<RGWRESTConn> get_remote_conn(RGWRados *store,
}
#define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response
static int send_to_remote_gateway(const string& remote, req_info& info,
static int send_to_remote_gateway(RGWRESTConn* conn, req_info& info,
bufferlist& in_data, JSONParser& parser)
{
bufferlist response;
RGWRESTConn *conn;
if (remote.empty()) {
if (!store->rest_master_conn) {
cerr << "Invalid rest master connection" << std::endl;
return -EINVAL;
}
conn = store->rest_master_conn;
} else {
// check zonegroups
auto iter = store->zonegroup_conn_map.find(remote);
if (iter == store->zonegroup_conn_map.end()) {
// check zones
iter = store->zone_conn_map.find(remote);
if (iter == store->zone_conn_map.end()) {
cerr << "could not find connection for zone or zonegroup id: "
<< remote << std::endl;
return -ENOENT;
}
}
conn = iter->second;
}
rgw_user user;
int ret = conn->forward(user, info, NULL, MAX_REST_RESPONSE, &in_data, &response);
@ -1609,13 +1588,13 @@ static int send_to_url(const string& url, const string& access,
return ret;
}
static int send_to_remote_or_url(const string& remote, const string& url,
static int send_to_remote_or_url(RGWRESTConn *conn, const string& url,
const string& access, const string& secret,
req_info& info, bufferlist& in_data,
JSONParser& parser)
{
if (url.empty()) {
return send_to_remote_gateway(remote, info, in_data, parser);
return send_to_remote_gateway(conn, info, in_data, parser);
}
return send_to_url(url, access, secret, info, in_data, parser);
}
@ -1669,7 +1648,7 @@ static int commit_period(RGWRealm& realm, RGWPeriod& period,
jf.flush(bl);
JSONParser p;
int ret = send_to_remote_or_url(remote, url, access, secret, info, bl, p);
int ret = send_to_remote_or_url(nullptr, url, access, secret, info, bl, p);
if (ret < 0) {
cerr << "request failed: " << cpp_strerror(-ret) << std::endl;
@ -1796,7 +1775,7 @@ static int do_period_pull(const string& remote, const string& url, const string&
bufferlist bl;
JSONParser p;
int ret = send_to_remote_or_url(remote, url, access_key, secret_key,
int ret = send_to_remote_or_url(nullptr, url, access_key, secret_key,
info, bl, p);
if (ret < 0) {
cerr << "request failed: " << cpp_strerror(-ret) << std::endl;
@ -4569,7 +4548,7 @@ int main(int argc, const char **argv)
jf.flush(bl);
JSONParser p;
ret = send_to_remote_or_url(remote, url, access_key, secret_key,
ret = send_to_remote_or_url(nullptr, url, access_key, secret_key,
info, bl, p);
if (ret < 0) {
cerr << "request failed: " << cpp_strerror(-ret) << std::endl;