]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: clear master_zonegroup when reseting RGWPeriodMap 13172/head
authorOrit Wasserman <owasserm@redhat.com>
Sun, 25 Dec 2016 10:36:34 +0000 (12:36 +0200)
committerNathan Cutler <ncutler@suse.com>
Sun, 29 Jan 2017 09:37:17 +0000 (10:37 +0100)
Fixes: http://tracker.ceph.com/issues/17239
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit d8f42fe6be659c1d48bf04b30aa54ad616936145)

src/rgw/rgw_rados.h

index 32856a20aaea8b08a670815eea743f7e18302078..c44cd12c67bd4220ac61d2dbfa3557500aeabad9 100644 (file)
@@ -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;