]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: need to pass need_to_wait for throttle_data()
authorYehuda Sadeh <yehuda@redhat.com>
Sat, 2 Aug 2014 20:01:05 +0000 (13:01 -0700)
committerSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 22:15:23 +0000 (15:15 -0700)
need_to_wait wasn't passed into processor->throttle_data(). This was
broken in fix for #8937.

CID 1229541:    (PW.PARAM_SET_BUT_NOT_USED)

Backport: firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e93818df33286a2a7f73b593dc20da412db4e0a6)
(cherry picked from commit 8519e9ab06caf6999e1243514a93eaffb155ab2e)

src/rgw/rgw_op.cc

index c43ca146701f773b1aa2a511d376787930ec2669..76947480bb4f131da781b2f92d90c2ae72c86c39 100644 (file)
@@ -1582,7 +1582,7 @@ static int put_data_and_throttle(RGWPutObjProcessor *processor, bufferlist& data
       hash = NULL; /* only calculate hash once */
     }
 
-    ret = processor->throttle_data(handle, false);
+    ret = processor->throttle_data(handle, need_to_wait);
     if (ret < 0)
       return ret;