From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 22 Jan 2017 12:42:14 +0000 (+0200)
Subject: rgw: we need to reinit the zonegroup after assignment to avoid invalid cct and store
X-Git-Tag: v10.2.6~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a27f6a72ec836af1672e8aa344fb80d067ed20a8;p=ceph.git

rgw: we need to reinit the zonegroup after assignment to avoid invalid cct and store

Fixes: http://tracker.ceph.com/issues/18631
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit ac9a7565ddf801121f22476cf3f66668f311833e)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 30bd72a00cc..9225613fa94 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3583,6 +3583,11 @@ int RGWRados::init_zg_from_period(bool *initialized)
   if (iter != current_period.get_map().zonegroups.end()) {
     ldout(cct, 20) << "using current period zonegroup " << zonegroup.get_name() << dendl;
     zonegroup = iter->second;
+    ret = zonegroup.init(cct, this, false);
+    if (ret < 0) {
+      ldout(cct, 0) << "failed init zonegroup: " << " " << cpp_strerror(-ret) << dendl;
+      return ret;
+    }
     ret = zone_params.init(cct, this);
     if (ret < 0 && ret != -ENOENT) {
       ldout(cct, 0) << "failed reading zone params info: " << " " << cpp_strerror(-ret) << dendl;