(pulsar) branch branch-3.0 updated: [fix][test] fix flaky GrowableArrayBlockingQueueTest.testPollBlockingThreadsTermination (#24576)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new b83004ceaf7 [fix][test] fix flaky 
GrowableArrayBlockingQueueTest.testPollBlockingThreadsTermination (#24576)
b83004ceaf7 is described below

commit b83004ceaf788feeecf848ce05d618b493f283f7
Author: Ruimin MA <maruimin...@gmail.com>
AuthorDate: Tue Jul 29 21:32:11 2025 +0800

    [fix][test] fix flaky 
GrowableArrayBlockingQueueTest.testPollBlockingThreadsTermination (#24576)
    
    Co-authored-by: Lari Hotari <lhot...@users.noreply.github.com>
    (cherry picked from commit e5cd79a7faf3ad24b672477cca8bc4fb7d15cc40)
---
 .../org/apache/pulsar/client/api/SimpleProducerConsumerTest.java  | 2 +-
 .../common/util/collections/GrowableArrayBlockingQueueTest.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
index ec851600b1b..db0cd3663d6 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
@@ -4091,8 +4091,8 @@ public class SimpleProducerConsumerTest extends 
ProducerConsumerBase {
                     consumer.receive();
                     fail("thread should have been interrupted");
                 } catch (PulsarClientException e) {
-                    terminateCompletedLatch.countDown();
                     interruptedThreadCount.incrementAndGet();
+                    terminateCompletedLatch.countDown();
                 }
             }).start();
         }
diff --git 
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
 
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
index 24209acce24..c94fe0b6045 100644
--- 
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
+++ 
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
@@ -229,8 +229,8 @@ public class GrowableArrayBlockingQueueTest {
                     fail("thread should have been interrupted");
                 } catch (InterruptedException e) {
                     // Expected interruption, record and notify
-                    terminateCompletedLatch.countDown();
                     interruptedThreadCount.incrementAndGet();
+                    terminateCompletedLatch.countDown();
                 }
             }).start();
         }
@@ -263,8 +263,8 @@ public class GrowableArrayBlockingQueueTest {
                     Integer poll = queue.poll(1, TimeUnit.HOURS);
                     // should return a null value if queue is terminated
                     assertNull(poll);
-                    terminateCompletedLatch.countDown();
                     terminateThreadCount.incrementAndGet();
+                    terminateCompletedLatch.countDown();
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }
@@ -298,15 +298,15 @@ public class GrowableArrayBlockingQueueTest {
                     try {
                         queue.take();
                     } catch (InterruptedException e) {
-                        terminateCompletedLatch.countDown();
                         terminateThreadCount.incrementAndGet();
+                        terminateCompletedLatch.countDown();
                     }
                 } else {
                     try {
                         Integer poll = queue.poll(1, TimeUnit.HOURS);
                         assertNull(poll);
-                        terminateCompletedLatch.countDown();
                         terminateThreadCount.incrementAndGet();
+                        terminateCompletedLatch.countDown();
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }