RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-07 01:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

radosgw-admin: allow --remote to specify zone or zonegroup id

Browse Source 
--remote was only looking for zonegroup connections. extended to check
for zone connections as well

updated the usage to clarify that it expects zone/zonegroup ids

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2016-05-10 15:48:33 -04:00
parent c431924742
commit 9fcff89ee1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rgw/rgw_admin.cc
View File

@ -184,7 +184,7 @@ void _usage()
cout << " replica mdlog get/delete\n"; cout << " replica mdlog get/delete\n";
cout << " replica datalog get/delete\n"; cout << " replica datalog get/delete\n";
cout << " --metadata-key=<key> key to retrieve metadata from with metadata get\n"; cout << " --metadata-key=<key> key to retrieve metadata from with metadata get\n";
cout << " --remote=<remote> remote to pull period\n"; cout << " --remote=<remote> zone or zonegroup id of remote gateway\n";
cout << " --period=<id> period id\n"; cout << " --period=<id> period id\n";
cout << " --epoch=<number> period epoch\n"; cout << " --epoch=<number> period epoch\n";
cout << " --commit commit the period during 'period update'\n"; cout << " --commit commit the period during 'period update'\n";
@ -1322,11 +1322,17 @@ static int send_to_remote_gateway(const string& remote, req_info& info,
} }
conn = store->rest_master_conn; conn = store->rest_master_conn;
} else { } else {
// check zonegroups
auto iter = store->zonegroup_conn_map.find(remote); auto iter = store->zonegroup_conn_map.find(remote);
if (iter == store->zonegroup_conn_map.end()) { if (iter == store->zonegroup_conn_map.end()) {
cerr << "could not find connection to: " << remote << std::endl; // 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; return -ENOENT;
} }
}
conn = iter->second; conn = iter->second;
} }
rgw_user user; rgw_user user;

2
src/test/cli/radosgw-admin/help.t
View File

@ -136,7 +136,7 @@
replica mdlog get/delete replica mdlog get/delete
replica datalog get/delete replica datalog get/delete
--metadata-key=<key> key to retrieve metadata from with metadata get --metadata-key=<key> key to retrieve metadata from with metadata get
--remote=<remote> remote to pull period --remote=<remote> zone or zonegroup id of remote gateway
--period=<id> period id --period=<id> period id
--epoch=<number> period epoch --epoch=<number> period epoch
--commit commit the period during 'period update' --commit commit the period during 'period update'