RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

radosgw: tolerate race creating .rgw* metadata pools

Browse Source 
There may be multiple people trying to create these pools.  That's just
fine.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-09-26 21:35:52 -07:00
parent 916e49d710
commit e47c11cf5d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rgw/rgw_rados.cc
View File

@ -76,6 +76,8 @@ int RGWRados::open_root_pool_ctx()
int r = rados->ioctx_create(RGW_ROOT_BUCKET, root_pool_ctx);
if (r == -ENOENT) {
r = rados->pool_create(RGW_ROOT_BUCKET);
if (r == -EEXIST)
r = 0;
if (r < 0)
return r;
@ -90,6 +92,8 @@ int RGWRados::init_watch()
int r = rados->ioctx_create(RGW_CONTROL_BUCKET, control_pool_ctx);
if (r == -ENOENT) {
r = rados->pool_create(RGW_CONTROL_BUCKET);
if (r == -EEXIST)
r = 0;
if (r < 0)
return r;
@ -311,7 +315,9 @@ int RGWRados::list_objects(string& id, rgw_bucket& bucket, int max, string& pref
* if auid is set, it sets the auid of the underlying rados io_ctx
* returns 0 on success, -ERR# otherwise.
*/
int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, map<std::string, bufferlist>& attrs, bool create_pool, bool exclusive, uint64_t auid)
int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket,
map<std::string, bufferlist>& attrs,
bool create_pool, bool exclusive, uint64_t auid)
{
librados::ObjectWriteOperation op;
op.create(exclusive);
@ -326,6 +332,8 @@ int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, map<std::string
if (create_pool) {
ret = rados->pool_create(bucket.pool.c_str(), auid);
if (ret == -EEXIST)
ret = 0;
if (ret < 0)
root_pool_ctx.remove(bucket.name.c_str());
}