From e3eb2f258aeddd4d72fcb8f14d5eb3cb4eb512d2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 27 Sep 2011 14:07:50 -0700 Subject: [PATCH] rgw: put bucketid allocator object in root (.rgw) pool This keeps the .rgw.control pool disposable. Signed-off-by: Sage Weil --- src/rgw/rgw_rados.cc | 2 +- src/rgw/rgw_rados.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index e86b2186f717a..93b07849d6df3 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -314,7 +314,7 @@ int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, uint32_t nop = 0; ::encode(nop, bl); - r = control_pool_ctx.write(bucket_marker_ver_oid, bl, bl.length(), 0); + r = root_pool_ctx.write(bucket_marker_ver_oid, bl, bl.length(), 0); if (r < 0) return r; diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 6b06087433310..3d01208145fbe 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -96,8 +96,8 @@ class RGWRados : public RGWAccess RGWWatcher *watcher; uint64_t watch_handle; - librados::IoCtx root_pool_ctx; - librados::IoCtx control_pool_ctx; + librados::IoCtx root_pool_ctx; // .rgw + librados::IoCtx control_pool_ctx; // .rgw.control int get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, librados::IoCtx& io_ctx, string& actual_obj, RGWObjState **state); int append_atomic_test(RGWRadosCtx *rctx, rgw_obj& obj, librados::IoCtx& io_ctx, -- 2.39.5