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

rgw: avoid race condition in RGWHTTPClient::wait()
joscollin · Oct 31, 2018 · 1b57df1 · 1b57df1
2 parents 223a24e + c1a43a1
commit 1b57df1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
@@ -52,6 +52,9 @@ struct rgw_http_req_data : public RefCountedObject {
 
   int wait() {
     Mutex::Locker l(lock);
+    if (done) {
+      return ret;
+    }
     cond.Wait(lock);
     return ret;
   }
@@ -527,11 +530,7 @@ bool RGWHTTPClient::is_done()
  */
 int RGWHTTPClient::wait()
 {
-  if (!req_data->is_done()) {
-    return req_data->wait();
-  }
-
-  return req_data->ret;
+  return req_data->wait();
 }
 
 void RGWHTTPClient::cancel()