diff options
Diffstat (limited to 'src/rgw/driver/rados/rgw_rados.cc')
| -rw-r--r-- | src/rgw/driver/rados/rgw_rados.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index 207ed5c919c..fe0d14d1029 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -1365,11 +1365,10 @@ int RGWRados::init_complete(const DoutPrefixProvider *dpp, optional_yield y) int RGWRados::init_svc(bool raw, const DoutPrefixProvider *dpp) { if (raw) { - return svc.init_raw(cct, use_cache, get_rados_handle(), null_yield, dpp); + return svc.init_raw(cct, driver, use_cache, null_yield, dpp); } - return svc.init(cct, use_cache, run_sync_thread, get_rados_handle(), - null_yield, dpp); + return svc.init(cct, driver, use_cache, run_sync_thread, null_yield, dpp); } int RGWRados::init_ctl(const DoutPrefixProvider *dpp) @@ -1383,9 +1382,16 @@ int RGWRados::init_ctl(const DoutPrefixProvider *dpp) */ int RGWRados::init_begin(const DoutPrefixProvider *dpp) { - int ret = init_rados(); + int ret; + + ret = driver->init_neorados(dpp); + if (ret < 0) { + ldpp_dout(dpp, 0) << "ERROR: failed to initialize neorados (ret=" << cpp_strerror(-ret) << ")" << dendl; + return ret; + } + ret = init_rados(); if (ret < 0) { - ldpp_dout(dpp, 0) << "ERROR: failed to init rados (ret=" << cpp_strerror(-ret) << ")" << dendl; + ldpp_dout(dpp, 0) << "ERROR: failed to initialize librados (ret=" << cpp_strerror(-ret) << ")" << dendl; return ret; } |