X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Frgw%2Frgw_lib.h;h=0c5e9e721685f42755c9dfcc3bb70f386ce0914f;hb=20effc670b57271cb089376d6d0800990e5218d5;hp=ce916a12c7d014ffd9e05c89a950d7eac6d29566;hpb=7c673caec407dd16107e56e4b51a6d00f021315c;p=ceph.git diff --git a/ceph/src/rgw/rgw_lib.h b/ceph/src/rgw/rgw_lib.h index ce916a12c..0c5e9e721 100644 --- a/ceph/src/rgw/rgw_lib.h +++ b/ceph/src/rgw/rgw_lib.h @@ -1,5 +1,6 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab +// vim: ts=8 sw=2 smarttab ft=cpp + #ifndef RGW_LIB_H #define RGW_LIB_H @@ -14,21 +15,24 @@ #include "rgw_process.h" #include "rgw_rest_s3.h" // RGW_Auth_S3 #include "rgw_ldap.h" -#include "include/assert.h" +#include "services/svc_zone_utils.h" +#include "include/ceph_assert.h" + +#define dout_subsys ceph_subsys_rgw -class OpsLogSocket; +class OpsLogSink; namespace rgw { class RGWLibFrontend; - class RGWLib { + class RGWLib : public DoutPrefixProvider { RGWFrontendConfig* fec; RGWLibFrontend* fe; - OpsLogSocket* olog; - rgw::LDAPHelper* ldh; + OpsLogSink* olog; + rgw::LDAPHelper* ldh{nullptr}; RGWREST rest; // XXX needed for RGWProcessEnv - RGWRados* store; + rgw::sal::Store* store; boost::intrusive_ptr cct; public: @@ -36,14 +40,18 @@ namespace rgw { {} ~RGWLib() {} - RGWRados* get_store() { return store; } + rgw::sal::Store* get_store() { return store; } RGWLibFrontend* get_fe() { return fe; } rgw::LDAPHelper* get_ldh() { return ldh; } + CephContext *get_cct() const override { return cct.get(); } + unsigned get_subsys() const { return dout_subsys; } + std::ostream& gen_prefix(std::ostream& out) const { return out << "lib rgw: "; } + int init(); - int init(vector& args); + int init(std::vector& args); int stop(); }; @@ -60,16 +68,19 @@ namespace rgw { RGWLibIO() { get_env().set("HTTP_HOST", ""); } - RGWLibIO(const RGWUserInfo &_user_info) + explicit RGWLibIO(const RGWUserInfo &_user_info) : user_info(_user_info) {} - void init_env(CephContext *cct) override {} + int init_env(CephContext *cct) override { + env.init(cct); + return 0; + } const RGWUserInfo& get_user() { return user_info; } - int set_uid(RGWRados* store, const rgw_user& uid); + int set_uid(rgw::sal::Store* store, const rgw_user& uid); int write_data(const char *buf, int len); int read_data(char *buf, int len); @@ -112,29 +123,30 @@ namespace rgw { friend class RGWRESTMgr_Lib; public: - int authorize() override; + int authorize(const DoutPrefixProvider *dpp, optional_yield y) override; RGWHandler_Lib() {} ~RGWHandler_Lib() override {} - static int init_from_header(struct req_state *s); + static int init_from_header(rgw::sal::Store* store, + struct req_state *s); }; /* RGWHandler_Lib */ class RGWLibRequest : public RGWRequest, public RGWHandler_Lib { + private: + std::unique_ptr tuser; // Don't use this. It's empty except during init. public: CephContext* cct; - RGWUserInfo* user; /* unambiguiously return req_state */ inline struct req_state* get_state() { return this->RGWRequest::s; } - RGWLibRequest(CephContext* _cct, RGWUserInfo* _user) - : RGWRequest(0), cct(_cct), user(_user) + RGWLibRequest(CephContext* _cct, std::unique_ptr _user) + : RGWRequest(rgwlib.get_store()->get_new_req_id()), + tuser(std::move(_user)), cct(_cct) {} - RGWUserInfo* get_user() { return user; } - - int postauth_init() override { return 0; } + int postauth_init(optional_yield) override { return 0; } /* descendant equivalent of *REST*::init_from_header(...): * prepare request for execute()--should mean, fixup URI-alikes @@ -152,30 +164,27 @@ namespace rgw { RGWLibIO* io, struct req_state* _s) { RGWRequest::init_state(_s); - RGWHandler::init(rados_ctx->store, _s, io); - - /* fixup _s->req */ - _s->req = this; - - log_init(); + RGWHandler::init(rados_ctx->get_store(), _s, io); get_state()->obj_ctx = rados_ctx; - get_state()->req_id = store->unique_id(id); - get_state()->trans_id = store->unique_trans_id(id); + get_state()->req_id = store->zone_unique_id(id); + get_state()->trans_id = store->zone_unique_trans_id(id); + get_state()->bucket_tenant = tuser->get_tenant(); + get_state()->set_user(tuser); - log_format(_s, "initializing for trans_id = %s", - get_state()->trans_id.c_str()); + ldpp_dout(_s, 2) << "initializing for trans_id = " + << get_state()->trans_id.c_str() << dendl; int ret = header_init(); if (ret == 0) { - ret = init_from_header(_s); + ret = init_from_header(rados_ctx->get_store(), _s); } return ret; } virtual bool only_bucket() = 0; - int read_permissions(RGWOp *op) override; + int read_permissions(RGWOp *op, optional_yield y) override; }; /* RGWLibRequest */ @@ -185,32 +194,30 @@ namespace rgw { RGWObjectCtx rados_ctx; public: - RGWLibContinuedReq(CephContext* _cct, RGWUserInfo* _user) - : RGWLibRequest(_cct, _user), io_ctx(), - rstate(_cct, &io_ctx.get_env(), _user), rados_ctx(rgwlib.get_store(), - &rstate) + RGWLibContinuedReq(CephContext* _cct, + std::unique_ptr _user) + : RGWLibRequest(_cct, std::move(_user)), io_ctx(), + rstate(_cct, &io_ctx.get_env(), id), + rados_ctx(rgwlib.get_store(), &rstate) { io_ctx.init(_cct); RGWRequest::init_state(&rstate); - RGWHandler::init(rados_ctx.store, &rstate, &io_ctx); - - /* fixup _s->req */ - get_state()->req = this; - - log_init(); + RGWHandler::init(rados_ctx.get_store(), &rstate, &io_ctx); get_state()->obj_ctx = &rados_ctx; - get_state()->req_id = store->unique_id(id); - get_state()->trans_id = store->unique_trans_id(id); + get_state()->req_id = store->zone_unique_id(id); + get_state()->trans_id = store->zone_unique_trans_id(id); - log_format(get_state(), "initializing for trans_id = %s", - get_state()->trans_id.c_str()); + ldpp_dout(get_state(), 2) << "initializing for trans_id = " + << get_state()->trans_id.c_str() << dendl; } - inline RGWRados* get_store() { return store; } + inline rgw::sal::Store* get_store() { return store; } + inline RGWLibIO& get_io() { return io_ctx; } + inline RGWObjectCtx& get_octx() { return rados_ctx; } - virtual int execute() final { abort(); } + virtual int execute() final { ceph_abort(); } virtual int exec_start() = 0; virtual int exec_continue() = 0; virtual int exec_finish() = 0;