From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 1 Mar 2016 20:52:44 +0000 (+0100)
Subject: rgw: calculate payload hash in RGWPutObj_ObjStore only when necessary.
X-Git-Tag: v10.1.0~243^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55eeee93c58dbaee2e3241594c854710162057c7;p=ceph.git

rgw: calculate payload hash in RGWPutObj_ObjStore only when necessary.

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

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index fa119947c3a..6b4b2c12dac 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -1001,10 +1001,13 @@ int RGWPutObj_ObjStore::get_data(bufferlist& bl)
     bufferptr bp(cl);
 
     int read_len; /* cio->read() expects int * */
-    int r = STREAM_IO(s)->read(bp.c_str(), cl, &read_len, true);
-    len = read_len;
-    if (r < 0)
+    int r = STREAM_IO(s)->read(bp.c_str(), cl, &read_len,
+                               s->aws4_auth_needs_complete);
+    if (r < 0) {
       return r;
+    }
+
+    len = read_len;
     bl.append(bp, 0, len);
   }