From 5fd8b0d1639c67e355f0fc0d7e6d7036618d87a1 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 30 May 2014 14:47:25 -0700 Subject: [PATCH] rgw: if extra data pool name is empty, use data pool name instead Fixes: #8311 An empty pool name could be used as the extra data pool. Signed-off-by: Yehuda Sadeh (cherry picked from commit b300318113b162522759d4794b1cfa3d1d9398e4) --- src/rgw/rgw_rados.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 36690ce1c9c0f..cf6e06616b0b1 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1691,7 +1691,8 @@ int RGWRados::open_bucket_data_ctx(rgw_bucket& bucket, librados::IoCtx& data_ctx int RGWRados::open_bucket_data_extra_ctx(rgw_bucket& bucket, librados::IoCtx& data_ctx) { - int r = open_bucket_pool_ctx(bucket.name, bucket.data_extra_pool, data_ctx); + string& pool = (!bucket.data_extra_pool.empty() ? bucket.data_extra_pool : bucket.data_pool); + int r = open_bucket_pool_ctx(bucket.name, pool, data_ctx); if (r < 0) return r; -- 2.39.5