octopus: rgw: forward request in multisite for RGWDeleteBucketPolicy and RGWDeleteBucketPublicAccessBlock #45435
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbodley
reviewed
May 6, 2022
src/rgw/rgw_op.cc
Outdated
| @@ -7850,6 +7850,13 @@ int RGWDeleteBucketPolicy::verify_permission() | |||
|
|
|||
| void RGWDeleteBucketPolicy::execute() | |||
| { | |||
| bufferlist data; | |||
| op_ret = forward_request_to_master(s, nullptr, store, data, nullptr, s->info); | |||
There was a problem hiding this comment.
/ceph-15.2.16-106-g57e79a81/src/rgw/rgw_op.cc: In member function ‘virtual void RGWDeleteBucketPolicy::execute()’:
/ceph-15.2.16-106-g57e79a81/src/rgw/rgw_op.cc:7855:75: error: cannot convert ‘req_info’ to ‘req_info*’
op_ret = forward_request_to_master(s, nullptr, store, data, nullptr, s->info);
~~~^~~~
/ceph-15.2.16-106-g57e79a81/src/rgw/rgw_op.cc:3024:57: note: initializing argument 6 of ‘int forward_request_to_master(req_state*, obj_version*, rgw::sal::RGWRadosStore*, ceph::bufferlist&, JSONParser*, req_info*)’
JSONParser *jp, req_info *forward_info)
cfsnyder
force-pushed
the
wip-51776-octopus
branch
from
5d8ef24
to
6f12b2c
Compare
and RGWDeleteBucketPublicAccessBlock Fix: https://tracker.ceph.com/issues/45551 Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com> (cherry picked from commit 1f9267e) Conflicts: src/rgw/rgw_op.cc Cherry-pick notes: - signature of forward_request_to_master changed after Octopus and was not a member of Store
cfsnyder
force-pushed
the
wip-51776-octopus
branch
from
6f12b2c
to
56a1f4c
Compare
|
seeing some s3test failures (example teuthology.log): this makes it sound like it's trying to forward the request and hanging, but it isn't a multisite configuration so there's no master zone to send anything to |
cbodley
reviewed
May 18, 2022
| @@ -7850,6 +7850,13 @@ int RGWDeleteBucketPolicy::verify_permission() | |||
|
|
|||
| void RGWDeleteBucketPolicy::execute() | |||
| { | |||
| bufferlist data; | |||
| op_ret = forward_request_to_master(s, nullptr, store, data, nullptr, &s->info); | |||
There was a problem hiding this comment.
all of the other callers (at least, on octopus) are making this call conditionally. for example, in RGWPutBucketPolicy::execute():
if (!store->svc()->zone->is_meta_master()) {
op_ret = forward_request_to_master(s, NULL, store, data, nullptr);
if (op_ret < 0) {
ldpp_dout(this, 20) << "forward_request_to_master returned ret=" << op_ret << dendl;
return;
}
}can you please wrap both of these calls to forward_request_to_master() the same way?
if (!store->svc()->zone->is_meta_master()) {
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/51776
backport of #35061
parent tracker: https://tracker.ceph.com/issues/45551
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh