From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 7 Oct 2015 17:26:19 +0000 (-0400)
Subject: lirgw: call RGWHanlder_Lib::init_from_header
X-Git-Tag: v10.1.0~382^2~210
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cbcb641ef800c871557ce04f0d843befda312f0c;p=ceph.git

lirgw: call RGWHanlder_Lib::init_from_header

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

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 8e7b4e57836b..4c861c7a1922 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -223,8 +223,6 @@ int RGWLibProcess::process_request(RGWLibRequest* req, RGWLibIO* io)
     goto done;
   }
 
-  /* XXXX almost correct, I think */
-  #if 0
   req->log(s, "verifying op permissions");
   ret = op->verify_permission();
   if (ret < 0) {
@@ -235,8 +233,6 @@ int RGWLibProcess::process_request(RGWLibRequest* req, RGWLibIO* io)
       goto done;
     }
   }
-  #endif
-  req->log(s, "here 3");
 
   req->log(s, "verifying op params");
   ret = op->verify_params();
@@ -273,9 +269,8 @@ done:
 
 int RGWLibFrontend::init()
 {
-  /* XXX */
   pprocess = new RGWLibProcess(g_ceph_context, &env,
-			       g_conf->rgw_thread_pool_size, conf);
+			      g_conf->rgw_thread_pool_size, conf);
   return 0;
 }
 
diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h
index a2e5b0cb19a8..132288647805 100644
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@ -142,7 +142,11 @@ public:
     log_format(_s, "initializing for trans_id = %s",
 	      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;
diff --git a/src/rgw/rgw_rest_lib.cc b/src/rgw/rgw_rest_lib.cc
index 718ae9da157f..55078bcce9b3 100644
--- a/src/rgw/rgw_rest_lib.cc
+++ b/src/rgw/rgw_rest_lib.cc
@@ -7,9 +7,7 @@
 #include "rgw_rest_lib.h"
 #include "rgw_file.h"
 
-/* XXX going away ! */
 
-#warning kill me
 /* static */
 int RGWHandler_Lib::init_from_header(struct req_state *s)
 {