From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 25 Dec 2016 10:36:34 +0000 (+0200)
Subject: rgw: clear master_zonegroup when reseting RGWPeriodMap
X-Git-Tag: v11.2.1~179^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=478d0315cb8457ecfd5cb6f96c82d12e066c7c2f;p=ceph.git

rgw: clear master_zonegroup when reseting RGWPeriodMap

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

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 32856a20aaea..c44cd12c67bd 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1349,6 +1349,7 @@ struct RGWPeriodMap
   void reset() {
     zonegroups.clear();
     zonegroups_by_api.clear();
+    master_zonegroup.clear();
   }
 
   uint32_t get_zone_short_id(const string& zone_id) const;