From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Mon, 24 Apr 2017 10:45:16 +0000 (+0200)
Subject: rgw: drop aws4_auth_needs_complete from req_state.
X-Git-Tag: v12.1.0~155^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48093dcaff6a20abef3b03c30c516c49d8587e51;p=ceph.git

rgw: drop aws4_auth_needs_complete from req_state.

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

diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
index 896a6025d501..36906c168687 100644
--- a/src/rgw/rgw_auth_s3.cc
+++ b/src/rgw/rgw_auth_s3.cc
@@ -823,7 +823,6 @@ size_t AWSv4Completer::recv_body(char* const buf, const size_t max)
 void AWSv4Completer::modify_request_state(req_state* const s_rw)
 {
   /* TODO(rzarzynski): switch to the dedicated filter over RestfulClient. */
-  s_rw->aws4_auth_needs_complete = aws4_auth_needs_complete;
   s_rw->aws4_auth_streaming_mode = aws4_auth_streaming_mode;
 
   s_rw->aws4_auth = std::unique_ptr<rgw_aws4_auth>(new rgw_aws4_auth);
diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 6052cfd53884..a8b25b582df0 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -264,7 +264,6 @@ req_state::req_state(CephContext* _cct, RGWEnv* e, RGWUserInfo* u)
   bucket_acl = NULL;
   object_acl = NULL;
   expect_cont = false;
-  aws4_auth_needs_complete = false;
   aws4_auth_streaming_mode = false;
 
   header_ended = false;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index c36f377bd51b..5ad041857efb 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1806,7 +1806,6 @@ struct req_state {
   bool system_request;
 
   /* aws4 auth support */
-  bool aws4_auth_needs_complete;
   bool aws4_auth_streaming_mode;
   unique_ptr<rgw_aws4_auth> aws4_auth;
 
diff --git a/src/rgw/rgw_rest_metadata.cc b/src/rgw/rgw_rest_metadata.cc
index 272e304f17eb..099a206e50f6 100644
--- a/src/rgw/rgw_rest_metadata.cc
+++ b/src/rgw/rgw_rest_metadata.cc
@@ -162,11 +162,9 @@ void RGWOp_Metadata_Put::execute() {
     return;
   }
 
-  if (s->aws4_auth_needs_complete) {
-    http_ret = do_aws4_auth_completion();
-    if (http_ret < 0) {
-      return;
-    }
+  http_ret = do_aws4_auth_completion();
+  if (http_ret < 0) {
+    return;
   }
   
   frame_metadata_key(s, metadata_key);