rgw: port the LoadGen frontend to the new RGWStreamIOEngine infrastructure.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_loadgen.h b/src/rgw/rgw_loadgen.h
index 01b2161606ffbd5eaec467b51c90e708ea05e1ec..134c222357423f10dd1ad648b025f5fe970619df 100644 (file)
--- a/src/rgw/rgw_loadgen.h
+++ b/src/rgw/rgw_loadgen.h
@@ -26,10 +26,11 @@ struct RGWLoadGenRequestEnv {
 
 /* XXX does RGWLoadGenIO actually want to perform stream/HTTP I/O,
  * or (e.g) are these NOOPs? */
-class RGWLoadGenIO : public RGWStreamIO
+class RGWLoadGenIO : public RGWStreamIOEngine
 {
   uint64_t left_to_read;
   RGWLoadGenRequestEnv *req;
+  RGWEnv env;
 public:
   void init_env(CephContext *cct);
 
@@ -44,6 +45,10 @@ public:
 
   explicit RGWLoadGenIO(RGWLoadGenRequestEnv *_re) : left_to_read(0), req(_re) {}
   void flush();
+
+  RGWEnv& get_env() override {
+    return env;
+  }
 };
 
 #endif

diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc
index 0e4aeb256a392c341d5fd678029dc86d2c818362..8303237d0da19826f839c468ca610eb2b55b7650 100644 (file)
--- a/src/rgw/rgw_loadgen_process.cc
+++ b/src/rgw/rgw_loadgen_process.cc
@@ -128,7 +128,8 @@ void RGWLoadGenProcess::handle_request(RGWRequest* r)
   env.set_date(tm);
   env.sign(access_key);
 
-  RGWLoadGenIO client_io(&env);
+  RGWLoadGenIO real_client_io(&env);
+  RGWStreamIOLegacyWrapper client_io(&real_client_io);
 
   int ret = process_request(store, rest, req, &client_io, olog);
   if (ret < 0) {