Merge pull request #11863 from dachary/wip-17735-jewel

jewel: RGW will not list Argonaut-era bucket via HTTP (but radosgw-admin works) Reviewed-by: Orit Wasserman <owasserm@redhat.com>
ceph · Nov 11, 2016 · f163bcf · f163bcf
2 parents cfca2a4 + 3c56892
commit f163bcf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
@@ -902,7 +902,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;