From: Radoslaw Zarzynski Date: Thu, 30 Jun 2016 15:39:35 +0000 (+0200) Subject: rgw: add support for the healthcheck feature of Swift API. X-Git-Tag: v10.2.6~77^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b89e7b896ecb53801441ebfb1f9ffdd3c990093;p=ceph.git rgw: add support for the healthcheck feature of Swift API. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit a3c04064a884fcb1d9897b9a5cb094829fee151d) --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 3221291e521..0f92cf055a5 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -1283,6 +1283,7 @@ OPTION(rgw_keystone_revocation_interval, OPT_INT, 15 * 60) // seconds between t OPTION(rgw_keystone_verify_ssl, OPT_BOOL, true) // should we try to verify keystone's ssl OPTION(rgw_keystone_implicit_tenants, OPT_BOOL, false) // create new users in their own tenants of the same name OPTION(rgw_cross_domain_policy, OPT_STR, "") +OPTION(rgw_healthcheck_disabling_path, OPT_STR, "") // path that existence causes the healthcheck to respond 503 OPTION(rgw_s3_auth_use_rados, OPT_BOOL, true) // should we try to use the internal credentials for s3? OPTION(rgw_s3_auth_use_keystone, OPT_BOOL, false) // should we try to use keystone for s3? diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 372d4091098..a72cccb4323 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -424,6 +424,7 @@ enum RGWOpType { RGW_OP_BULK_DELETE, RGW_OP_SET_ATTRS, RGW_OP_GET_CROSS_DOMAIN_POLICY, + RGW_OP_GET_HEALTH_CHECK, /* rgw specific */ RGW_OP_ADMIN_SET_METADATA diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 6c825d8b1ee..66b731faad2 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -349,6 +349,9 @@ int main(int argc, const char **argv) set_logging(new RGWRESTMgr_SWIFT_CrossDomain)); } + swift_resource->register_resource("healthcheck", + set_logging(new RGWRESTMgr_SWIFT_HealthCheck)); + if (! swift_at_root) { rest.register_resource(g_conf->rgw_swift_url_prefix, set_logging(swift_resource)); diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index ce94155ac70..ea4319e1805 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -3,6 +3,7 @@ #include #include +#include #include @@ -4369,6 +4370,16 @@ void RGWListBucketMultiparts::execute() } } +void RGWGetHealthCheck::execute() +{ + if (! g_conf->rgw_healthcheck_disabling_path.empty() && + ::access(g_conf->rgw_healthcheck_disabling_path.c_str(), F_OK )) { + op_ret = -ERR_SERVICE_UNAVAILABLE; + } else { + op_ret = 0; /* 200 OK */ + } +} + int RGWDeleteMultiObj::verify_permission() { if (!verify_bucket_permission(s, RGW_PERM_WRITE)) diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index 07024afc84d..ce3255c4121 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -1329,6 +1329,31 @@ public: }; +class RGWGetHealthCheck : public RGWOp { +public: + RGWGetHealthCheck() = default; + ~RGWGetHealthCheck() = default; + + int verify_permission() override { + return 0; + } + + void execute() override; + + const string name() override { + return "get_health_check"; + } + + RGWOpType get_type() override { + return RGW_OP_GET_HEALTH_CHECK; + } + + uint32_t op_mask() override { + return RGW_OP_TYPE_READ; + } +}; + + class RGWDeleteMultiObj : public RGWOp { protected: int max_to_delete; diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index d476c7dd84d..24849aad086 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -263,6 +263,12 @@ public: ~RGWGetCrossDomainPolicy_ObjStore() = default; }; +class RGWGetHealthCheck_ObjStore : public RGWGetHealthCheck { +public: + RGWGetHealthCheck_ObjStore() = default; + ~RGWGetHealthCheck_ObjStore() = default; +}; + class RGWCopyObj_ObjStore : public RGWCopyObj { public: RGWCopyObj_ObjStore() {} diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index e09a5580541..53cd18527e5 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -1249,7 +1249,6 @@ void RGWBulkDelete_ObjStore_SWIFT::send_response() rgw_flush_formatter_and_reset(s, s->formatter); } - void RGWGetCrossDomainPolicy_ObjStore_SWIFT::send_response() { set_req_state_err(s, op_ret); @@ -1268,6 +1267,17 @@ void RGWGetCrossDomainPolicy_ObjStore_SWIFT::send_response() STREAM_IO(s)->write(ss.str().c_str(), ss.str().length()); } +void RGWGetHealthCheck_ObjStore_SWIFT::send_response() +{ + set_req_state_err(s, op_ret); + dump_errno(s); + end_header(s, this, "application/xml"); + + if (op_ret) { + STREAM_IO(s)->print("DISABLED BY FILE"); + } +} + RGWOp *RGWHandler_REST_Service_SWIFT::op_get() { return new RGWListBuckets_ObjStore_SWIFT; diff --git a/src/rgw/rgw_rest_swift.h b/src/rgw/rgw_rest_swift.h index 51215ea00ca..977c1cceff3 100644 --- a/src/rgw/rgw_rest_swift.h +++ b/src/rgw/rgw_rest_swift.h @@ -280,6 +280,15 @@ public: void send_response() override; }; +class RGWGetHealthCheck_ObjStore_SWIFT + : public RGWGetHealthCheck_ObjStore { +public: + RGWGetHealthCheck_ObjStore_SWIFT() = default; + ~RGWGetHealthCheck_ObjStore_SWIFT() = default; + + void send_response() override; +}; + class RGWHandler_SWIFT_CrossDomain : public RGWHandler_REST { public: RGWHandler_SWIFT_CrossDomain() = default; @@ -333,4 +342,57 @@ public: }; +class RGWHandler_SWIFT_HealthCheck : public RGWHandler_REST { +public: + RGWHandler_SWIFT_HealthCheck() = default; + ~RGWHandler_SWIFT_HealthCheck() = default; + + RGWOp *op_get() override { + return new RGWGetHealthCheck_ObjStore_SWIFT(); + } + + int init(RGWRados* const store, + struct req_state* const state, + RGWClientIO* const cio) override { + state->dialect = "swift"; + state->formatter = new JSONFormatter; + state->format = RGW_FORMAT_JSON; + + return RGWHandler::init(store, state, cio); + } + + int authorize() override { + return 0; + } + + int postauth_init() override { + return 0; + } + + int read_permissions(RGWOp *) override { + return 0; + } + + virtual RGWAccessControlPolicy *alloc_policy() { return nullptr; } + virtual void free_policy(RGWAccessControlPolicy *policy) {} +}; + +class RGWRESTMgr_SWIFT_HealthCheck : public RGWRESTMgr { +public: + RGWRESTMgr_SWIFT_HealthCheck() = default; + ~RGWRESTMgr_SWIFT_HealthCheck() = default; + + RGWRESTMgr *get_resource_mgr(struct req_state* const s, + const std::string& uri, + std::string* const out_uri) override { + return this; + } + + RGWHandler_REST* get_handler(struct req_state* const s) override { + s->prot_flags |= RGW_REST_SWIFT; + return new RGWHandler_SWIFT_HealthCheck; + } +}; + + #endif