From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 29 Apr 2016 21:43:40 +0000 (-0400)
Subject: rgw: RGWPeriodMap::update() only hashes given zonegroup
X-Git-Tag: v11.0.0~489^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe8bdd9534a88bc684cb3b4f8d4c53fe2d977fa9;p=ceph.git

rgw: RGWPeriodMap::update() only hashes given zonegroup

RGWPeriodMap::update() is called with each zonegroup, so it only needs
to generate short_zone_ids for the zones in the given zonegroup

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 5fef5921bf8d..f1d7bfcdff78 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1653,13 +1653,11 @@ int RGWPeriodMap::update(const RGWZoneGroup& zonegroup, CephContext *cct)
     master_zonegroup = "";
   }
 
-  for (auto iter : zonegroups) {
-    for (auto i : iter.second.zones) {
-      string& zone_id = i.second.id;
-      if (short_zone_ids.find(zone_id) == short_zone_ids.end()) {
-        uint32_t short_id = gen_short_zone_id(zone_id);
-        short_zone_ids[i.second.id] = short_id;
-      }
+  for (auto& i : zonegroup.zones) {
+    string& zone_id = i.second.id;
+    if (short_zone_ids.find(zone_id) == short_zone_ids.end()) {
+      uint32_t short_id = gen_short_zone_id(zone_id);
+      short_zone_ids[i.second.id] = short_id;
     }
   }