From 17e2573fbee5a2592b129dce04a936a51f28fa14 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Fri, 28 Aug 2026 06:10:35 +0000 Subject: [PATCH] fix(kafka): fall back to topic names when metadata times out --- .../java/com/dbx/agent/kafka/KafkaAgent.java | 23 ++++++++++++++++++- .../com/dbx/agent/kafka/KafkaAgentTest.java | 19 +++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java b/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java index d1cc17090e..61dffc8f48 100644 --- a/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java +++ b/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java @@ -650,9 +650,15 @@ public final class KafkaAgent { topics.add(topic); } } catch (Exception error) { - if (!isUnsupportedVersionError(error)) { + if (!isUnsupportedVersionError(error) && !isTimeoutError(error)) { throw error; } + if (isTimeoutError(error)) { + logger().warn( + "Kafka topic descriptions timed out; returning topic names without partition metadata", + error + ); + } for (TopicListing listing : listings) { Map topic = new LinkedHashMap<>(); topic.put("name", listing.name()); @@ -2582,6 +2588,21 @@ public final class KafkaAgent { return false; } + /** + * A topic listing is still useful when the broker cannot describe every topic before the + * request deadline. Keep timeout detection narrow so authorization, transport, and unknown + * topic failures remain visible to the caller instead of being mistaken for a partial result. + */ + private static boolean isTimeoutError(Throwable error) { + for (Throwable current : causeChain(error)) { + if (current instanceof java.util.concurrent.TimeoutException + || current instanceof org.apache.kafka.common.errors.TimeoutException) { + return true; + } + } + return false; + } + static boolean hasUnsupportedVersionException(Throwable error) { return causeChain(error).stream().anyMatch(UnsupportedVersionException.class::isInstance); } diff --git a/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java b/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java index 43aba0a5fa..eaeaa46e0c 100644 --- a/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java +++ b/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java @@ -255,6 +255,25 @@ class KafkaAgentTest { assertFalse(topics.get(1).containsKey("partitions")); } + @Test + void topicListingFallsBackWhenDescriptionsTimeOut() throws Exception { + Object result = KafkaAgent.topicListResult( + Arrays.asList( + new TopicListing("orders", Uuid.randomUuid(), false), + new TopicListing("payments", Uuid.randomUuid(), false) + ), + names -> { + throw new java.util.concurrent.TimeoutException("describeTopics timed out"); + } + ); + + @SuppressWarnings("unchecked") + List> topics = (List>) ((Map) result).get("topics"); + assertEquals(Arrays.asList("orders", "payments"), topics.stream().map(topic -> topic.get("name")).toList()); + assertFalse(topics.get(0).containsKey("partitions")); + assertFalse(topics.get(1).containsKey("replicationFactor")); + } + @Test void topicListingPreservesNonVersionDescriptionErrors() { IllegalStateException failure = new IllegalStateException("metadata authorization failed");