From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 26 Oct 2015 17:02:05 +0000 (+0100)
Subject: rgw: update current_period after adding converted zonegroup
X-Git-Tag: v10.1.0~354^2~281
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2650b3b05ebb45e0bbbba74205fbd90d4296c983;p=ceph.git

rgw: update current_period after adding converted zonegroup

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 5d30877b9e49..36014fc31c12 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2997,6 +2997,7 @@ int RGWRados::replace_region_with_zonegroup()
     lderr(cct) << "failed to list regions: ret "<< ret << " " << cpp_strerror(-ret) << dendl;
     return ret;
   }
+
   list<string>::iterator iter;
   /* create zonegroups */
   for (iter = regions.begin(); iter != regions.end(); ++iter)
@@ -3058,6 +3059,11 @@ int RGWRados::replace_region_with_zonegroup()
 	  lderr(cct) << "failed to add zonegroup to current_period: " << cpp_strerror(-ret) << dendl;
 	  return ret;
 	}
+	ret = current_period.update();
+	if (ret < 0) {
+	  lderr(cct) << "failed to update current_period: " << cpp_strerror(-ret) << dendl;
+	  return ret;
+	}
       }
 
       derr << "delete region " << *iter << dendl;