Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rgw: put object's acl can't work well on the latest object #13078

Merged
merged 1 commit into from
Mar 8, 2017
Merged

rgw: put object's acl can't work well on the latest object #13078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 22 additions & 8 deletions src/rgw/rgw_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,24 @@ static int get_obj_attrs(RGWRados *store, struct req_state *s, rgw_obj& obj, map
return read_op.prepare();
}

static int modify_obj_attr(RGWRados *store, struct req_state *s, rgw_obj& obj, const char* attr_name, bufferlist& attr_val)
{
map<string, bufferlist> attrs;
RGWRados::Object op_target(store, s->bucket_info, *static_cast<RGWObjectCtx *>(s->obj_ctx), obj);
RGWRados::Object::Read read_op(&op_target);

read_op.params.attrs = &attrs;
read_op.params.perr = &s->err;

int r = read_op.prepare();
if (r < 0) {
return r;
}
store->set_atomic(s->obj_ctx, read_op.state.obj);
attrs[attr_name] = attr_val;
return store->set_attrs(s->obj_ctx, read_op.state.obj, attrs, NULL);
}

static int get_system_obj_attrs(RGWRados *store, struct req_state *s, rgw_obj& obj, map<string, bufferlist>& attrs,
uint64_t *obj_size, RGWObjVersionTracker *objv_tracker)
{
Expand Down Expand Up @@ -4185,16 +4203,12 @@ void RGWPutACLs::execute()
obj.set_instance(s->object.instance);
map<string, bufferlist> attrs;

store->set_atomic(s->obj_ctx, obj);

if (!s->object.empty()) {
op_ret = get_obj_attrs(store, s, obj, attrs);
if (op_ret < 0)
return;

attrs[RGW_ATTR_ACL] = bl;
op_ret = store->set_attrs(s->obj_ctx, obj, attrs, NULL);
//if instance is empty, we should modify the latest object
op_ret = modify_obj_attr(store, s, obj, RGW_ATTR_ACL, bl);
} else {
store->set_atomic(s->obj_ctx, obj);

attrs = s->bucket_attrs;
attrs[RGW_ATTR_ACL] = bl;
op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs, &s->bucket_info.objv_tracker);
Expand Down