RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19582 from qrGitHub/wip-rgw-redundant-readingAttrs

Browse Source 
rgw: remove get_system_obj_attrs in function RGWDeleteLC::execute and RGWDeleteCORS::execute

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Yuri Weinstein 2018-01-08 08:53:19 -08:00 committed by GitHub
commit 4032b1a4fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rgw/rgw_op.cc
View File

@ -4933,16 +4933,7 @@ void RGWPutLC::execute()
void RGWDeleteLC::execute() void RGWDeleteLC::execute()
{ {
bufferlist bl; map<string, bufferlist> attrs = s->bucket_attrs;
map<string, bufferlist> attrs;
map<string, bufferlist>::iterator iter;
rgw_raw_obj obj;
store->get_bucket_instance_obj(s->bucket, obj);
store->set_prefetch_data(s->obj_ctx, obj);
op_ret = get_system_obj_attrs(store, s, obj, attrs, NULL, &s->bucket_info.objv_tracker);
if (op_ret < 0)
return;
attrs.erase(RGW_ATTR_LC); attrs.erase(RGW_ATTR_LC);
op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs, op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
&s->bucket_info.objv_tracker); &s->bucket_info.objv_tracker);
@ -5040,21 +5031,13 @@ void RGWDeleteCORS::execute()
if (op_ret < 0) if (op_ret < 0)
return op_ret; return op_ret;
rgw_raw_obj obj;
if (!cors_exist) { if (!cors_exist) {
dout(2) << "No CORS configuration set yet for this bucket" << dendl; dout(2) << "No CORS configuration set yet for this bucket" << dendl;
op_ret = -ENOENT; op_ret = -ENOENT;
return op_ret; return op_ret;
} }
store->get_bucket_instance_obj(s->bucket, obj);
store->set_prefetch_data(s->obj_ctx, obj);
map<string, bufferlist> attrs;
map<string, bufferlist>::iterator iter;
op_ret = get_system_obj_attrs(store, s, obj, attrs, NULL, &s->bucket_info.objv_tracker);
if (op_ret < 0)
return op_ret;
map<string, bufferlist> attrs = s->bucket_attrs;
attrs.erase(RGW_ATTR_CORS); attrs.erase(RGW_ATTR_CORS);
op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs, op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
&s->bucket_info.objv_tracker); &s->bucket_info.objv_tracker);