rgw: wait for completion only if not completion available

In a bucket aio operation, wait for completions only if there are no
completions available. Otherwise we might wait forever, as everything
already complete.

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

diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index fa33dac24be25d2ad6fc6ddc84d13fcddf5a1405..545b36bcff569e11acba7361e4c468c05a6409f9 100644 (file)
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -66,8 +66,11 @@ bool BucketIndexAioManager::wait_for_completions(int valid_ret_code,
     lock.Unlock();
     return false;
   }
-  // Wait for AIO completion
-  cond.Wait(lock);
+
+  if (completions.empty()) {
+    // Wait for AIO completion
+    cond.Wait(lock);
+  }
 
   // Clear the completed AIOs
   map<int, librados::AioCompletion*>::iterator iter = completions.begin();