RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

lirgw: call RGWHanlder_Lib::init_from_header

Browse Source 
Call this from the general RGWLibRequest init() method, after
descendant header_init() has run.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Matt Benjamin 2015-10-07 13:26:19 -04:00
parent 6dae209ceb
commit cbcb641ef8
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rgw/librgw.cc
View File

@ -223,8 +223,6 @@ int RGWLibProcess::process_request(RGWLibRequest* req, RGWLibIO* io)
goto done; goto done;
} }
/* XXXX almost correct, I think */
#if 0
req->log(s, "verifying op permissions"); req->log(s, "verifying op permissions");
ret = op->verify_permission(); ret = op->verify_permission();
if (ret < 0) { if (ret < 0) {
@ -235,8 +233,6 @@ int RGWLibProcess::process_request(RGWLibRequest* req, RGWLibIO* io)
goto done; goto done;
} }
} }
#endif
req->log(s, "here 3");
req->log(s, "verifying op params"); req->log(s, "verifying op params");
ret = op->verify_params(); ret = op->verify_params();
@ -273,7 +269,6 @@ done:
int RGWLibFrontend::init() int RGWLibFrontend::init()
{ {
/* XXX */
pprocess = new RGWLibProcess(g_ceph_context, &env, pprocess = new RGWLibProcess(g_ceph_context, &env,
g_conf->rgw_thread_pool_size, conf); g_conf->rgw_thread_pool_size, conf);
return 0; return 0;

6
src/rgw/rgw_lib.h
View File

@ -142,7 +142,11 @@ public:
log_format(_s, "initializing for trans_id = %s", log_format(_s, "initializing for trans_id = %s",
get_state()->trans_id.c_str()); get_state()->trans_id.c_str());
return header_init(); int ret = header_init();
if (ret == 0) {
ret = init_from_header(_s);
}
return ret;
} }
virtual bool only_bucket() = 0; virtual bool only_bucket() = 0;

2
src/rgw/rgw_rest_lib.cc
View File

@ -7,9 +7,7 @@
#include "rgw_rest_lib.h" #include "rgw_rest_lib.h"
#include "rgw_file.h" #include "rgw_file.h"
/* XXX going away ! */
#warning kill me
/* static */ /* static */
int RGWHandler_Lib::init_from_header(struct req_state *s) int RGWHandler_Lib::init_from_header(struct req_state *s)
{ {