RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23119 from cbodley/wip-rgw-link-tenant

Browse Source 
rgw: RGWBucket::link supports tenant

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Casey Bodley 2018-07-20 09:51:01 -04:00 committed by GitHub
commit 1c1e766cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rgw/rgw_bucket.cc
View File

@ -819,21 +819,20 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg)
rgw_bucket bucket = op_state.get_bucket();
const rgw_pool& root_pool = store->get_zone_params().domain_root;
rgw_raw_obj obj(root_pool, bucket.name);
std::string bucket_entry;
rgw_make_bucket_entry_name(tenant, bucket_name, bucket_entry);
rgw_raw_obj obj(root_pool, bucket_entry);
RGWObjVersionTracker objv_tracker;
map<string, bufferlist> attrs;
RGWBucketInfo bucket_info;
string key = bucket.name + ":" + bucket_id;
RGWObjectCtx obj_ctx(store);
int r = store->get_bucket_instance_info(obj_ctx, key, bucket_info, NULL, &attrs);
int r = store->get_bucket_instance_info(obj_ctx, bucket, bucket_info, NULL, &attrs);
if (r < 0) {
return r;
}
rgw_user user_id = op_state.get_user_id();
map<string, bufferlist>::iterator aiter = attrs.find(RGW_ATTR_ACL);
if (aiter != attrs.end()) {
bufferlist aclbl = aiter->second;
@ -881,8 +880,8 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg)
aclbl.clear();
policy_instance.encode(aclbl);
string oid_bucket_instance = RGW_BUCKET_INSTANCE_MD_PREFIX + key;
rgw_raw_obj obj_bucket_instance(root_pool, oid_bucket_instance);
rgw_raw_obj obj_bucket_instance;
store->get_bucket_instance_obj(bucket, obj_bucket_instance);
r = store->system_obj_set_attr(NULL, obj_bucket_instance, RGW_ATTR_ACL, aclbl, &objv_tracker);
if (r < 0) {
return r;