rgw: fix init_zg_from_period when default zone is not set as default

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 5393077e07bed45b9fc007591d365f1229d3e815)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 47f3790b3313f8bec57941863b15ab60059f5621..0d36eac67534d962080403d87dc0c9c9a0ea1a09 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3690,6 +3690,14 @@ int RGWRados::init_zg_from_period(bool *initialized)
     if (ret < 0 && ret != -ENOENT) {
       ldout(cct, 0) << "failed reading zone params info: " << " " << cpp_strerror(-ret) << dendl;
       return ret;
+    } if (ret ==-ENOENT && zonegroup.get_name() == default_zonegroup_name) {
+      ldout(cct, 10) << " Using default name "<< default_zone_name << dendl;
+      zone_params.set_name(default_zone_name);
+      ret = zone_params.init(cct, this);
+      if (ret < 0 && ret != -ENOENT) {
+       ldout(cct, 0) << "failed reading zone params info: " << " " << cpp_strerror(-ret) << dendl;
+       return ret;
+      }
     }
   }
   for (iter = current_period.get_map().zonegroups.begin();