Merge pull request #13949 from cbodley/wip-15618

rgw: clear old zone short ids on period update Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
ceph · Mar 14, 2017 · 6ba4858 · 6ba4858
2 parents 13e7587 + 9c45633
commit 6ba4858
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
@@ -1302,6 +1302,10 @@ int RGWPeriod::update()
     return ret;
   }
 
+  // clear zone short ids of removed zones. period_map.update() will add the
+  // remaining zones back
+  period_map.short_zone_ids.clear();
+
   for (auto& iter : zonegroups) {
     RGWZoneGroup zg(string(), iter);
     ret = zg.init(cct, store);