From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Fri, 29 Jul 2016 10:31:45 +0000 (+0200)
Subject: rgw: RGWClientIO::get_env() is pure virtual now.
X-Git-Tag: v11.1.0~454^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=754bf7cd1e09fa08281cdd0a627e9eca22857389;p=ceph.git

rgw: RGWClientIO::get_env() is pure virtual now.

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

diff --git a/src/rgw/rgw_client_io.cc b/src/rgw/rgw_client_io.cc
index 41afe9aafcb..c152ffa5281 100644
--- a/src/rgw/rgw_client_io.cc
+++ b/src/rgw/rgw_client_io.cc
@@ -13,7 +13,7 @@ void RGWClientIO::init(CephContext *cct) {
   init_env(cct);
 
   if (cct->_conf->subsys.should_gather(ceph_subsys_rgw, 20)) {
-    std::map<string, string, ltstr_nocase>& env_map = env.get_map();
+    std::map<string, string, ltstr_nocase>& env_map = get_env().get_map();
     std::map<string, string, ltstr_nocase>::iterator iter = env_map.begin();
 
     for (iter = env_map.begin(); iter != env_map.end(); ++iter) {
diff --git a/src/rgw/rgw_client_io.h b/src/rgw/rgw_client_io.h
index e9456878ee9..89c3123cb4d 100644
--- a/src/rgw/rgw_client_io.h
+++ b/src/rgw/rgw_client_io.h
@@ -15,19 +15,14 @@
 
 class RGWClientIO {
 protected:
-  RGWEnv env;
-
   virtual void init_env(CephContext *cct) = 0;
 
 public:
   virtual ~RGWClientIO() {}
 
   void init(CephContext *cct);
-  RGWEnv& get_env() {
-    return env;
-  }
-
-  virtual int complete_request() = 0; /* XXX signature likely changing */
+  virtual RGWEnv& get_env() = 0;
+  virtual int complete_request() = 0;
 }; /* RGWClient IO */
 
 
@@ -91,6 +86,9 @@ class RGWStreamIO : public RGWStreamIOEngine,
     return _account;
   }
 
+protected:
+  RGWEnv env;
+
 public:
   virtual ~RGWStreamIO() {}
   RGWStreamIO()
@@ -108,6 +106,10 @@ public:
 
   std::string grab_aws4_sha256_hash();
 
+  RGWEnv& get_env() override {
+    return env;
+  }
+
   void set_account(bool _accnt) override {
     _account = _accnt;
   }
diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h
index 96b52cebc66..c937d475120 100644
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@ -54,6 +54,7 @@ namespace rgw {
                    public RGWClientIOAccounter
   {
     RGWUserInfo user_info;
+    RGWEnv env;
   public:
     RGWLibIO() {
       get_env().set("HTTP_HOST", "");
@@ -76,6 +77,10 @@ namespace rgw {
     int complete_header();
     int send_content_length(uint64_t len);
 
+    RGWEnv& get_env() override {
+      return env;
+    }
+
     int complete_request() override { /* XXX */
       return 0;
     };