]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: calculate payload hash in RGWPutObj_ObjStore only when necessary. 7869/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Tue, 1 Mar 2016 20:52:44 +0000 (21:52 +0100)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Tue, 1 Mar 2016 20:55:44 +0000 (21:55 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_rest.cc

index fa119947c3a91cffb792c7e57c5f8bac0c499421..6b4b2c12daca89e288f4046917807c87193c58ec 100644 (file)
@@ -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);
   }