]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: don't re-set bucket tenant and name when selecting location
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 30 Nov 2015 21:50:07 +0000 (13:50 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 2 Dec 2015 18:45:41 +0000 (10:45 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index 7a878d78c7aff99d5054f78da530a67b7576515a..3e38e9effefe4d4ef447560c10e4cf25a1ea5aa6 100644 (file)
@@ -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;