RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: REST resources init uses configurables

Browse Source 
Also, move it to main().

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2012-09-20 17:13:16 -07:00
parent cea28f8cfb
commit fca6d3b992
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rgw/rgw_main.cc
View File

@ -33,6 +33,9 @@
#include "rgw_user.h"
#include "rgw_op.h"
#include "rgw_rest.h"
#include "rgw_rest_s3.h"
#include "rgw_rest_swift.h"
#include "rgw_swift_auth.h"
#include "rgw_swift.h"
#include "rgw_log.h"
#include "rgw_tools.h"
@ -126,7 +129,7 @@ class RGWProcess {
deque<RGWRequest *> m_req_queue;
ThreadPool m_tp;
Throttle req_throttle;
RGWREST rest;
RGWREST *rest;
struct RGWWQ : public ThreadPool::WorkQueue<RGWRequest> {
RGWProcess *process;
@ -181,9 +184,10 @@ class RGWProcess {
uint64_t max_req_id;
public:
RGWProcess(CephContext *cct, int num_threads)
RGWProcess(CephContext *cct, int num_threads, RGWREST *_rest)
: m_tp(cct, "RGWProcess::m_tp", num_threads),
req_throttle(cct, "rgw_ops", num_threads * 2),
rest(_rest),
req_wq(this, g_conf->rgw_op_thread_timeout,
g_conf->rgw_op_thread_suicide_timeout, &m_tp),
max_req_id(0) {}
@ -267,7 +271,7 @@ void RGWProcess::handle_request(RGWRequest *req)
RGWOp *op = NULL;
int init_error = 0;
RGWHandler *handler = rest.get_handler(s, &client_io, &init_error);
RGWHandler *handler = rest->get_handler(s, &client_io, &init_error);
if (init_error != 0) {
abort_early(s, init_error);
goto done;
@ -330,7 +334,7 @@ done:
if (handler)
handler->put_op(op);
rest.put_handler(handler);
rest->put_handler(handler);
rgwstore->destroy_context(s->obj_ctx);
FCGX_Finish_r(fcgx);
@ -443,7 +447,13 @@ int main(int argc, const char **argv)
rgw_log_usage_init(g_ceph_context);
RGWProcess process(g_ceph_context, g_conf->rgw_thread_pool_size);
RGWREST rest;
rest.register_default_mgr(new RGWRESTMgr_S3);
rest.register_resource(g_conf->rgw_swift_url_prefix, new RGWRESTMgr_SWIFT);
rest.register_resource(g_conf->rgw_swift_auth_entry, new RGWRESTMgr_SWIFT_Auth);
RGWProcess process(g_ceph_context, g_conf->rgw_thread_pool_size, &rest);
process.run();
rgw_log_usage_finalize();

5
src/rgw/rgw_rest.cc
View File

@ -777,8 +777,3 @@ RGWHandler *RGWREST::get_handler(struct req_state *s, RGWClientIO *cio,
return handler;
}
RGWREST::RGWREST() {
mgr.register_default_mgr(new RGWRESTMgr_S3);
mgr.register_resource("/swift", new RGWRESTMgr_SWIFT);
mgr.register_resource("/auth", new RGWRESTMgr_SWIFT_Auth);
}

12
src/rgw/rgw_rest.h
View File

@ -200,12 +200,22 @@ class RGWREST {
static int preprocess(struct req_state *s, RGWClientIO *cio);
public:
RGWREST();
RGWREST() {}
RGWHandler *get_handler(struct req_state *s, RGWClientIO *cio,
int *init_error);
void put_handler(RGWHandler *handler) {
mgr.put_handler(handler);
}
void register_resource(string resource, RGWRESTMgr *m, bool register_empty = false) {
if (!register_empty && resource.empty())
return;
mgr.register_resource(resource, m);
}
void register_default_mgr(RGWRESTMgr *m) {
mgr.register_default_mgr(m);
}
};
extern void set_req_state_err(struct req_state *s, int err_no);