From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 30 Nov 2015 21:50:07 +0000 (-0800)
Subject: rgw: don't re-set bucket tenant and name when selecting location
X-Git-Tag: v10.0.2~127^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf0a7b41e76044b64b23a9a793d77be88fdb998e;p=ceph.git

rgw: don't re-set bucket tenant and name when selecting location

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 7a878d78c7a..3e38e9effef 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2990,10 +2990,6 @@ int RGWRados::set_bucket_location_by_rule(const string& location_rule, const str
   bucket.data_extra_pool = placement_info.data_extra_pool;
   bucket.index_pool = placement_info.index_pool;
 
-  // XXX The select_legacy_bucket_placement() does this, but here we don't?
-  // bucket.tenant = tenant_name;
-  // bucket.name = bucket_name;
-
   return 0;
 }
 
@@ -3085,8 +3081,6 @@ read_omap:
   }
   bucket.data_pool = pool_name;
   bucket.index_pool = pool_name;
-  bucket.tenant = tenant_name;
-  bucket.name = bucket_name;
 
   return 0;