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

Merge pull request #11207 from yehudasa/wip-17372

Browse Source 
rgw: get_zonegroup() uses "default" zonegroup if empty
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Orit Wasserman 2016-10-19 15:36:09 +02:00 committed by GitHub
commit e362f13978
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rgw/rgw_rados.cc
View File

@ -943,7 +943,12 @@ int RGWPeriod::init(CephContext *_cct, RGWRados *_store, bool setup_obj)
int RGWPeriod::get_zonegroup(RGWZoneGroup& zonegroup, const string& zonegroup_id) {
map<string, RGWZoneGroup>::const_iterator iter = period_map.zonegroups.find(zonegroup_id);
map<string, RGWZoneGroup>::const_iterator iter;
if (!zonegroup_id.empty()) {
iter = period_map.zonegroups.find(zonegroup_id);
} else {
iter = period_map.zonegroups.find("default");
}
if (iter != period_map.zonegroups.end()) {
zonegroup = iter->second;
return 0;