]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: init_zg_from_period() fixes
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 6 Jan 2016 23:58:49 +0000 (15:58 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:50 +0000 (16:13 -0800)
Reported-by: fangchen sun <sunspot0105@gmail.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index 3d554ace634c4152dac7220d35f3a856036b8f89..fc6340923fb37b2dac03a60dece082e9c5507d6c 100644 (file)
@@ -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;
     }
   }