From ad00e42a5d63ebf4d9b85643f0f06ffec36f9c28 Mon Sep 17 00:00:00 2001 From: Apoorv Mittal Date: Sat, 8 Jun 2024 02:07:20 +0100 Subject: [PATCH 1/2] KAFKA-16916: Fixing error in completing future --- .../java/org/apache/kafka/clients/admin/KafkaAdminClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index a677f6624c3e3..c59cccf67c4b8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -2326,7 +2326,7 @@ private Map> handleDescribeTopicsByNamesWi clusterResult.nodes().whenComplete( (nodes, exception) -> { if (exception != null) { - completeAllExceptionally(topicFutures.values(), exception.getCause()); + completeAllExceptionally(topicFutures.values(), exception); return; } From 0732d571ae9eb13afa56fd181ea5b7abcb74efb5 Mon Sep 17 00:00:00 2001 From: Apoorv Mittal Date: Sat, 8 Jun 2024 02:17:15 +0100 Subject: [PATCH 2/2] Enabling test --- .../authenticator/ClientAuthenticationFailureTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java index d9261f82bc6ee..a0e22ee150552 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java @@ -40,7 +40,6 @@ import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -111,9 +110,6 @@ public void testProducerWithInvalidCredentials() { } @Test - // The test runs forever on trunk after c01279b9. (KAFKA-16916) - // We disable the test temporarily until we fix it to unblock the CI. - @Disabled public void testAdminClientWithInvalidCredentials() { Map props = new HashMap<>(saslClientConfigs); props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:" + server.port());