You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by vi...@apache.org on 2026/10/07 11:25:12 UTC

(kafka) branch trunk updated: KAFKA-15104: Fix flaky tests in MetadataQuorumCommandTest (#23531)

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

viktorsomogyi pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 120f1420e38 KAFKA-15104: Fix flaky tests in MetadataQuorumCommandTest (#23531)
120f1420e38 is described below

commit 120f1420e384fc95365b0fc2ae107e21e3b2afe6
Author: Tamas Barnabas Egyed <eg...@cloudera.com>
AuthorDate: Wed Oct 7 13:25:04 2026 +0200

    KAFKA-15104: Fix flaky tests in MetadataQuorumCommandTest (#23531)
    
    Update KafkaClusterTestKit startup order too. #23466 is not required
    anymore since, this commit removes the flaky annotations as well.
    
    Reviewed-by: Viktor Somogyi-Vass <vi...@gmail.com>
    
    Signed-off-by: Tamás Barnabás Egyed <eg...@cloudera.com>
---
 .../kafka/common/test/KafkaClusterTestKit.java     | 23 +++++++++++++---------
 .../kafka/tools/MetadataQuorumCommandTest.java     |  2 --
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
index 188cdd36d6a..4bc61e88c1b 100644
--- a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
+++ b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
@@ -588,23 +588,28 @@ public class KafkaClusterTestKit implements AutoCloseable {
     }
 
     public void startup() throws ExecutionException, InterruptedException {
-        List<Future<?>> futures = new ArrayList<>();
+        List<Future<?>> controllerFutures = new ArrayList<>();
+        List<Future<?>> brokerFutures = new ArrayList<>();
         try {
-            // Note the startup order here is chosen to be consistent with
-            // `KafkaRaftServer`. See comments in that class for an explanation.
+            // Startup order matches `KafkaRaftServer`: controllers before brokers.
+            // Submit all controllers concurrently (avoids deadlocking a multi-controller
+            // quorum), then await them before starting brokers so a broker can't fail
+            // catching up to a not-yet-ready controller and leak threads (KAFKA-15104).
             for (ControllerServer controller : controllers.values()) {
-                futures.add(executorService.submit(controller::startup));
+                controllerFutures.add(executorService.submit(controller::startup));
+            }
+            for (Future<?> future : controllerFutures) {
+                future.get();
             }
             for (BrokerServer broker : brokers.values()) {
-                futures.add(executorService.submit(broker::startup));
+                brokerFutures.add(executorService.submit(broker::startup));
             }
-            for (Future<?> future: futures) {
+            for (Future<?> future : brokerFutures) {
                 future.get();
             }
         } catch (Exception e) {
-            for (Future<?> future: futures) {
-                future.cancel(true);
-            }
+            brokerFutures.forEach(future -> future.cancel(true));
+            controllerFutures.forEach(future -> future.cancel(true));
             throw e;
         }
     }
diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
index 4c422aa925d..621943f695a 100644
--- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
@@ -20,7 +20,6 @@ import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.common.test.ClusterInstance;
 import org.apache.kafka.common.test.api.ClusterTest;
 import org.apache.kafka.common.test.api.ClusterTests;
-import org.apache.kafka.common.test.api.Flaky;
 import org.apache.kafka.common.test.api.Type;
 import org.apache.kafka.test.TestUtils;
 
@@ -43,7 +42,6 @@ class MetadataQuorumCommandTest {
      * 2. More brokers than controllers
      * 3. Fewer brokers than controllers
      */
-    @Flaky("KAFKA-15104")
     @ClusterTests({
         @ClusterTest(brokers = 2, controllers = 2),
         @ClusterTest(brokers = 2, controllers = 1),