From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 31 Oct 2018 18:56:29 +0000 (-0400)
Subject: Merge pull request #21767 from cfanz/wip-fix-rgw-race-condition
X-Git-Tag: v14.1.0~1025
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b57df1d514588b1c8232fe0c348b21fcc90c4ee;p=ceph.git

Merge pull request #21767 from cfanz/wip-fix-rgw-race-condition

rgw: avoid race condition in RGWHTTPClient::wait()
---

1b57df1d514588b1c8232fe0c348b21fcc90c4ee
diff --cc src/rgw/rgw_http_client.cc
index b7389e2c7b1,2e9ac8da6f0..f5dbef6ec50
--- a/src/rgw/rgw_http_client.cc
+++ b/src/rgw/rgw_http_client.cc
@@@ -527,14 -527,10 +530,10 @@@ bool RGWHTTPClient::is_done(
   */
  int RGWHTTPClient::wait()
  {
-   if (!req_data->is_done()) {
-     return req_data->wait();
-   }
- 
-   return req_data->ret;
+   return req_data->wait();
  }
  
 -RGWHTTPClient::~RGWHTTPClient()
 +void RGWHTTPClient::cancel()
  {
    if (req_data) {
      RGWHTTPManager *http_manager = req_data->mgr;