[Flaky test] Wait for deadlocked status to clear before continuing (a…

…pache#15266)
drianpauL · Apr 22, 2022 · 5795a56 · 5795a56
1 parent 2e5309c
commit 5795a56
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.Sets;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Phaser;
 import java.util.concurrent.locks.Lock;
@@ -44,6 +45,8 @@
 @Slf4j
 public class AdminApiHealthCheckTest extends MockedPulsarServiceBaseTest {
 
+    private final ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
+
     @BeforeMethod
     @Override
     public void setup() throws Exception {
@@ -135,6 +138,9 @@ public void testHealthCheckupDetectsDeadlock() throws Exception {
             thread2.interrupt();
             // wait for deadlock threads to finish
             phaser.arriveAndAwaitAdvance();
+            // wait for deadlocked status to clear before continuing
+            Awaitility.await().atMost(Duration.ofSeconds(10))
+                    .until(() -> threadBean.findDeadlockedThreads() == null);
         }
     }
 
@@ -157,7 +163,6 @@ private void deadlock(Lock lock1, Lock lock2, long millis) {
 
     @Test(timeOut = 5000L)
     public void testDeadlockDetectionOverhead() {
-        ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
         for (int i=0; i < 1000; i++) {
             long[] threadIds = threadBean.findDeadlockedThreads();
             // assert that there's no deadlock