RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 05:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10831 from cbodley/wip-17051

Browse Source 
rgw: delete region map after upgrade to zonegroup map
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Orit Wasserman 2016-08-25 09:55:53 +02:00 committed by GitHub
commit c19ecb05e4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rgw/rgw_rados.cc
View File

@ -3315,6 +3315,15 @@ int RGWRados::convert_regionmap()
current_period.set_user_quota(zonegroupmap.user_quota);
current_period.set_bucket_quota(zonegroupmap.bucket_quota);
// remove the region_map so we don't try to convert again
rgw_obj obj(pool, oid);
ret = delete_system_obj(obj);
if (ret < 0) {
ldout(cct, 0) << "Error could not remove " << obj
<< " after upgrading to zonegroup map: " << cpp_strerror(ret) << dendl;
return ret;
}
return 0;
}