From 280986f8e67e9a336aa0acedc5746c010a5296b7 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Tue, 13 Aug 2019 22:23:50 +0530 Subject: [PATCH] Added radosgw_admin_rest task to multisite yaml. svc_zone related modifications Signed-off-by: Shilpa Jagannath --- qa/suites/rgw/multisite/tasks/test_multi.yaml | 1 + src/rgw/rgw_op.cc | 4 +- src/rgw/rgw_rest_bucket.cc | 37 +++---- src/rgw/rgw_rest_user.cc | 99 ++++++++++--------- 4 files changed, 73 insertions(+), 68 deletions(-) diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml index 22b292f8d77..93a2eb2d3a5 100644 --- a/qa/suites/rgw/multisite/tasks/test_multi.yaml +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -22,3 +22,4 @@ tasks: - rgw-multisite-tests: config: reconfigure_delay: 60 +- radosgw_admin_rest: [c2.client.0] diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index a1d7939f7e9..ce5d495a110 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -2874,8 +2874,8 @@ int RGWCreateBucket::verify_permission() } int forward_request_to_master(struct req_state *s, obj_version *objv, - rgw::sal::RGWRadosStore *store, bufferlist& in_data, - JSONParser *jp, req_info *forward_info) + rgw::sal::RGWRadosStore *store, bufferlist& in_data, + JSONParser *jp, req_info *forward_info) { if (!store->svc()->zone->get_master_conn()) { ldpp_dout(s, 0) << "rest connection is invalid" << dendl; diff --git a/src/rgw/rgw_rest_bucket.cc b/src/rgw/rgw_rest_bucket.cc index 55822976b83..0c6c2284370 100644 --- a/src/rgw/rgw_rest_bucket.cc +++ b/src/rgw/rgw_rest_bucket.cc @@ -8,6 +8,7 @@ #include "include/str_list.h" #include "services/svc_sys_obj.h" +#include "services/svc_zone.h" #define dout_subsys ceph_subsys_rgw @@ -147,12 +148,12 @@ void RGWOp_Bucket_Link::execute() op_state.set_bucket_id(bucket_id); op_state.set_new_bucket_name(new_bucket_name); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWBucketAdminOp::link(store, op_state); @@ -187,12 +188,12 @@ void RGWOp_Bucket_Unlink::execute() op_state.set_user_id(uid); op_state.set_bucket_name(bucket); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWBucketAdminOp::unlink(store, op_state); @@ -225,12 +226,12 @@ void RGWOp_Bucket_Remove::execute() op_state.set_bucket_name(bucket); op_state.set_delete_children(delete_children); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWBucketAdminOp::remove_bucket(store, op_state, s->yield); diff --git a/src/rgw/rgw_rest_user.cc b/src/rgw/rgw_rest_user.cc index b570bc4fd2a..4c7a7995dc8 100644 --- a/src/rgw/rgw_rest_user.cc +++ b/src/rgw/rgw_rest_user.cc @@ -10,6 +10,9 @@ #include "include/str_list.h" #include "include/ceph_assert.h" +#include "services/svc_zone.h" +#include "services/svc_sys_obj.h" + #define dout_subsys ceph_subsys_rgw class RGWOp_User_List : public RGWRESTOp { @@ -194,12 +197,12 @@ void RGWOp_User_Create::execute() if (gen_key) op_state.set_generate_key(); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_User::create(store, op_state, flusher); @@ -314,12 +317,12 @@ void RGWOp_User_Modify::execute() op_state.set_op_mask(op_mask); } - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_User::modify(store, op_state, flusher); @@ -357,12 +360,12 @@ void RGWOp_User_Remove::execute() op_state.set_purge_data(purge_data); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_User::remove(store, op_state, flusher, s->yield); @@ -435,12 +438,12 @@ void RGWOp_Subuser_Create::execute() } op_state.set_key_type(key_type); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_Subuser::create(store, op_state, flusher); @@ -504,12 +507,12 @@ void RGWOp_Subuser_Modify::execute() } op_state.set_key_type(key_type); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_Subuser::modify(store, op_state, flusher); @@ -549,12 +552,12 @@ void RGWOp_Subuser_Remove::execute() if (purge_keys) op_state.set_purge_keys(); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_Subuser::remove(store, op_state, flusher); @@ -692,12 +695,12 @@ void RGWOp_Caps_Add::execute() op_state.set_user_id(uid); op_state.set_caps(caps); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_Caps::add(store, op_state, flusher); @@ -732,12 +735,12 @@ void RGWOp_Caps_Remove::execute() op_state.set_user_id(uid); op_state.set_caps(caps); - if (!store->svc.zone->is_meta_master()) { - bufferlist data; - op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); - if (op_ret < 0) { - ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; - return; + if (!store->svc()->zone->is_meta_master()) { + bufferlist data; + op_ret = forward_request_to_master(s, nullptr, store, data, nullptr); + if (op_ret < 0) { + ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl; + return; } } http_ret = RGWUserAdminOp_Caps::remove(store, op_state, flusher); -- 2.39.5