From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 6 Jan 2016 23:58:49 +0000 (-0800)
Subject: rgw: init_zg_from_period() fixes
X-Git-Tag: v10.1.0~354^2~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8821d0659fb033ca52e0b556916bb4bf627efc5e;p=ceph.git

rgw: init_zg_from_period() fixes

Reported-by: fangchen sun <sunspot0105@gmail.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 3d554ace634..fc6340923fb 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3449,11 +3449,10 @@ int RGWRados::init_zg_from_period(bool *initialized)
   for (iter = current_period.get_map().zonegroups.begin();
        iter != current_period.get_map().zonegroups.end(); ++iter){
     const RGWZoneGroup& zg = iter->second;
-    add_new_connection_to_map(zonegroup_conn_map, zg, new RGWRESTConn(cct, this, zonegroup.get_id(), zonegroup.endpoints));
+    add_new_connection_to_map(zonegroup_conn_map, zg, new RGWRESTConn(cct, this, zg.get_id(), zg.endpoints));
     if (!current_period.get_master_zonegroup().empty() &&
         zg.get_id() == current_period.get_master_zonegroup()) {
       rest_master_conn = new RGWRESTConn(cct, this, zg.get_id(), zg.endpoints);
-      break;
     }
   }