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.

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

rgw: don't write bucket_header when it is not changed in bucket_link/unlink #17356

Merged
merged 1 commit into from Sep 6, 2017

Conversation

shashalu
Copy link
Contributor

Signed-off-by: Shasha Lu lu.shasha@eisoo.com

@ZVampirEM77
Copy link
Contributor

ZVampirEM77 commented Aug 31, 2017

@shashalu Have you passed the compiling in your local env? I can not find the definition of "header" in

if (op.log_op && !header.syncstopped) {

and I compile it in my local env, the result is
/home/vvv/ceph/src/cls/rgw/cls_rgw.cc: In function ‘int rgw_bucket_link_olh(cls_method_context_t, ceph::bufferlist*, ceph::bufferlist*)’: /home/vvv/ceph/src/cls/rgw/cls_rgw.cc:1518:21: error: ‘header’ was not declared in this scope if (op.log_op && !header.syncstopped) { ^ /home/vvv/ceph/src/cls/rgw/cls_rgw.cc:1519:34: error: redeclaration of ‘rgw_bucket_dir_header header’ struct rgw_bucket_dir_header header; ^ /home/vvv/ceph/src/cls/rgw/cls_rgw.cc:1518:21: error: ‘<typeprefixerror>header’ previously declared here if (op.log_op && !header.syncstopped) { ^ /home/vvv/ceph/src/cls/rgw/cls_rgw.cc: In function ‘int rgw_bucket_unlink_instance(cls_method_context_t, ceph::bufferlist*, ceph::bufferlist*)’: /home/vvv/new_ceph/ceph/src/cls/rgw/cls_rgw.cc:1676:21: error: ‘header’ was not declared in this scope if (op.log_op && !header.syncstopped) { ^ /home/vvv/ceph/src/cls/rgw/cls_rgw.cc:1677:34: error: redeclaration of ‘rgw_bucket_dir_header header’ struct rgw_bucket_dir_header header; ^ /home/vvv/ceph/src/cls/rgw/cls_rgw.cc:1676:21: error: ‘<typeprefixerror>header’ previously declared here if (op.log_op && !header.syncstopped) { ^ make[3]: *** [src/cls/CMakeFiles/cls_rgw.dir/rgw/cls_rgw.cc.o] Error 1 make[3]: *** Waiting for unfinished jobs....

@ZVampirEM77
Copy link
Contributor

ZVampirEM77 commented Aug 31, 2017

My local branch is the newest master branch
`git log

commit b133a6d95a08a4fc89508f439adf4518da16cb33
Author: lu.shasha lu.shasha@eisoo.com
Date: Wed Aug 30 11:41:12 2017 +0800

rgw: don't read/write bucket_header when bucket_header is not changed in bucket_link/unlink

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>

commit 5923e77
Merge: fb795f5 fee7666
Author: Haomai Wang haomaiwang@gmail.com
Date: Wed Aug 30 22:19:12 2017 -0700

Merge pull request #17145 from optimistyzy/822_bl

os/bluestore/NVMEDevice: change write_bl to bl

Reviewed-by: Haomai Wang <haomai@xsky.com>

...`

@shashalu shashalu changed the title rgw: don't read/write bucket_header when it is not changed in bucket_link/unlink rgw: don't write bucket_header when it is not changed in bucket_link/unlink Aug 31, 2017
…ucket_link/unlink

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
@shashalu
Copy link
Contributor Author

@ZVampirEM77 sorry, I have made a mistake. Already revised.

@ZVampirEM77
Copy link
Contributor

LGTM

@shashalu
Copy link
Contributor Author

shashalu commented Sep 1, 2017

@cbodley Please take a look, thx

@yuriw yuriw merged commit 49d3072 into ceph:master Sep 6, 2017
@shashalu shashalu deleted the bucket_link/unlink_olh branch September 8, 2017 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants