ceph_test_rados_api_misc: avoid livelock from PoolCreationRace

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index 202c1c3af536516a196e260a68298699db0e5f86..74065842829de3d020f4958b3d06938726cf321a 100644 (file)
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -106,7 +106,11 @@ TEST(LibRadosMiscPool, PoolCreationRace) {
   rados_pool_create(cluster_a, pool2name);
 
   list<rados_completion_t> cls;
-  while (true) {
+  // this should normally trigger pretty easily, but we need to bound
+  // the requests because if we get too many we'll get stuck by always
+  // sending enough messages that we hit the socket failure injection.
+  int max = 512;
+  while (max--) {
     char buf[100];
     rados_completion_t c;
     rados_aio_create_completion(0, 0, 0, &c);
@@ -117,6 +121,11 @@ TEST(LibRadosMiscPool, PoolCreationRace) {
       break;
     }
   }
+  while (!rados_aio_is_complete(cls.front())) {
+    cout << "waiting 1 sec" << std::endl;
+    sleep(1);
+  }
+
   cout << " started " << cls.size() << " aios" << std::endl;
   for (auto c : cls) {
     cout << "waiting " << (void*)c << std::endl;