rgw: fix RGWSystemMetaObj::init by passing old_format flag

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index b7fcea7d7559c806df39a0cc5eb53273adfad34f..35d9557375e3e2bc4b45b24877f08b8000e7b0b2 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -343,7 +343,7 @@ int RGWSystemMetaObj::init(CephContext *_cct, RGWRados *_store, bool setup_obj,
     }
   }
 
-  return read_info(id);
+  return read_info(id, old_format);
 }
 
 int RGWSystemMetaObj::read_default(RGWDefaultSystemMetaObjInfo& default_info, const string& oid)
@@ -2790,7 +2790,7 @@ int RGWRados::convert_regionmap()
   } else if (ret == -ENOENT) {
     return 0;
   }
-    
+
   try {
     bufferlist::iterator iter = bl.begin();
     ::decode(zonegroupmap, iter);
@@ -2802,6 +2802,7 @@ int RGWRados::convert_regionmap()
   for (map<string, RGWZoneGroup>::iterator iter = zonegroupmap.zonegroups.begin();
        iter != zonegroupmap.zonegroups.end(); ++iter) {
     RGWZoneGroup& zonegroup = iter->second;
+    ret = zonegroup.init(cct, this, false);
     ret = zonegroup.update();
     if (ret < 0 && ret != -ENOENT) {
       ldout(cct, 0) << "Error could not update zonegroup " << zonegroup.get_name() << ": " <<
@@ -2863,11 +2864,11 @@ int RGWRados::replace_region_with_zonegroup()
   {
     derr << "create zonegroup " << *iter << dendl;
     /* read region info default has no data */
-    if (*iter != default_zonegroup_name){    
+    if (*iter != default_zonegroup_name){
       RGWZoneGroup zonegroup(*iter);   
       int ret = zonegroup.init(cct, this, true, true);
       if (ret < 0) {
-       lderr(cct) << "failed init default zonegroup: ret "<< ret << " " << cpp_strerror(-ret) << dendl;
+       lderr(cct) << "failed init zonegroup: ret "<< ret << " " << cpp_strerror(-ret) << dendl;
        return ret;
       }
       derr << "create zonegroup: store_info " << *iter << dendl;