]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set
authorSage Weil <sage@redhat.com>
Tue, 17 Mar 2020 16:52:32 +0000 (11:52 -0500)
committerNathan Cutler <ncutler@suse.com>
Wed, 13 May 2020 15:48:31 +0000 (17:48 +0200)
See https://tracker.ceph.com/issues/44582

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3a57e70028e6226a41ef295217160c038441cd70)

src/test/librados/misc.cc

index 0c351db2d264502abdf662ff19447e478820e0e8..34b7389edf478f87227fdb3305a1530e98fc2f10 100644 (file)
@@ -318,7 +318,12 @@ static void shutdown_racer_func()
   int i;
 
   for (i = 0; i < niter; ++i) {
-    ASSERT_EQ("", connect_cluster(&rad));
+    auto r = connect_cluster(&rad);
+    if (getenv("ALLOW_TIMEOUTS")) {
+      ASSERT_TRUE(r == "" || r == "rados_connect failed with error -110");
+    } else {
+      ASSERT_EQ("", r);
+    }
     rados_shutdown(rad);
   }
 }