rgw: fix busy wait in RGWHTTPManager

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
index 3647de8f9f0cea961ceaf2bd74707d14fcb990ef..cf21dba127386c7b60572d19c45733246d6e023e 100644 (file)
--- a/src/rgw/rgw_http_client.cc
+++ b/src/rgw/rgw_http_client.cc
@@ -256,6 +256,16 @@ static int do_curl_wait(CephContext *cct, CURLM *handle, int signal_fd)
     dout(0) << "ERROR: curl_multi_wait() returned " << ret << dendl;
     return -EIO;
   }
+
+  if (wait_fd.revents > 0) {
+    uint32_t buf;
+    ret = read(signal_fd, (void *)&buf, sizeof(buf));
+    if (ret < 0) {
+      ret = -errno;
+      dout(0) << "ERROR: " << __func__ << "(): read() returned " << ret << dendl;
+      return ret;
+    }
+  }
   return 0;
 }