From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 22 Jan 2017 12:40:16 +0000 (+0200)
Subject: rgw: fix init_zg_from_period when default zone is not set as default
X-Git-Tag: v10.2.6~21^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=006140adf7413ec3d482971bb44bfc3ffada2fbf;p=ceph.git

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 e288ee539cf8..30bd72a00ccc 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3587,6 +3587,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();