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

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

diff --cc src/rgw/rgw_http_client.cc
index b7389e2c7b16b1a9589fa607f3ceca1f6f630ac4,2e9ac8da6f02e1e6340ea4a04f3d67db2649d5dd..f5dbef6ec508d0718ac1ff070af5fab37e579ae6
--- 1/src/rgw/rgw_http_client.cc
--- 2/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;