From 9a0d4170a3ffc48b33f2bd61c5b06959041e736b Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 7 Sep 2015 11:09:11 +0200 Subject: [PATCH] rgw: RGWZoneParams should inherit from RGWSystemMetaObj Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index fc80a36c3c0fd..c3a6ce6024dc9 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -269,7 +269,7 @@ int RGWSystemMetaObj::init(CephContext *_cct, RGWRados *_store, bool setup_obj, id = get_predefined_id(); if (id.empty()) { r = use_default(old_format); - if (r == -ENOENT) { + if (r == -ENOENT) { r = create_default(); } if (r < 0) { @@ -278,6 +278,7 @@ int RGWSystemMetaObj::init(CephContext *_cct, RGWRados *_store, bool setup_obj, } } else if (!old_format) { r = read_id(name, id); + lderr(cct) << "read_id name " << name << " id " << id << dendl; if (r < 0) { lderr(cct) << "error in read_id for id " << id << " : " << cpp_strerror(-r) << dendl; return r; @@ -2986,12 +2987,14 @@ int RGWRados::init_watch() if (r == -ENOENT) { r = rad->pool_create(control_pool); + derr << "init_watch pool_create " << cpp_strerror(-r) << dendl; if (r == -EEXIST) r = 0; if (r < 0) return r; r = rad->ioctx_create(control_pool, control_pool_ctx); + derr << "init_watch ioctx_create " << cpp_strerror(-r) << dendl; if (r < 0) return r; } -- 2.39.5