From 0b6bd2545925b5e8a80d41de1fda13ffe9d30e2b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 9 Jul 2014 12:04:49 -0700 Subject: [PATCH] Revert "rgw: if extra data pool name is empty, use data pool name instead" This breaks multipart uploads on firefly, though not on master. Revert for now so we can release 0.80.2. This reverts commit 5fd8b0d1639c67e355f0fc0d7e6d7036618d87a1. --- src/rgw/rgw_rados.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index be8248e9f1b8b..30335c4ad7c04 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1693,8 +1693,7 @@ 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) { - 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); + int r = open_bucket_pool_ctx(bucket.name, bucket.data_extra_pool, data_ctx); if (r < 0) return r; -- 2.39.5