Skip to content

KAFKA-16905: Fixed potential thread block by admin API #16217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mumrah merged 2 commits into from
Jun 6, 2024
Merged

KAFKA-16905: Fixed potential thread block by admin API #16217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ec04b2
Fixed potential thread block by admin API
apoorvmittal10 Jun 5, 2024
d2957a8
Fixing checkstyle error
apoorvmittal10 Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
import java.util.OptionalLong;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -2129,7 +2128,7 @@ else if (topics instanceof TopicNameCollection)
throw new IllegalArgumentException("The TopicCollection: " + topics + " provided did not match any supported classes for describeTopics.");
}

Call generateDescribeTopicsCallWithMetadataApi(
private Call generateDescribeTopicsCallWithMetadataApi(
List<String> topicNamesList,
Map<String, KafkaFutureImpl<TopicDescription>> topicFutures,
DescribeTopicsOptions options,
Expand Down Expand Up @@ -2192,7 +2191,7 @@ void handleFailure(Throwable throwable) {
};
}

Call generateDescribeTopicsCallWithDescribeTopicPartitionsApi(
private Call generateDescribeTopicsCallWithDescribeTopicPartitionsApi(
List<String> topicNamesList,
Map<String, KafkaFutureImpl<TopicDescription>> topicFutures,
Map<Integer, Node> nodes,
Expand Down Expand Up @@ -2319,27 +2318,27 @@ private Map<String, KafkaFuture<TopicDescription>> handleDescribeTopicsByNamesWi
}

if (topicNamesList.isEmpty()) {
return new HashMap<>(topicFutures);
return Collections.unmodifiableMap(topicFutures);
}

// First, we need to retrieve the node info.
DescribeClusterResult clusterResult = describeCluster();
Map<Integer, Node> nodes;
try {
nodes = clusterResult.nodes().get().stream().collect(Collectors.toMap(Node::id, node -> node));
} catch (InterruptedException | ExecutionException e) {
completeAllExceptionally(topicFutures.values(), e.getCause());
return new HashMap<>(topicFutures);
}

final long now = time.milliseconds();
clusterResult.nodes().whenComplete(
(nodes, exception) -> {
if (exception != null) {
completeAllExceptionally(topicFutures.values(), exception.getCause());
return;
}

runnable.call(
generateDescribeTopicsCallWithDescribeTopicPartitionsApi(topicNamesList, topicFutures, nodes, options, now),
now
);
final long now = time.milliseconds();
Map<Integer, Node> nodeIdMap = nodes.stream().collect(Collectors.toMap(Node::id, node -> node));
runnable.call(
generateDescribeTopicsCallWithDescribeTopicPartitionsApi(topicNamesList, topicFutures, nodeIdMap, options, now),
now
);
});

return new HashMap<>(topicFutures);
return Collections.unmodifiableMap(topicFutures);
}

private Map<Uuid, KafkaFuture<TopicDescription>> handleDescribeTopicsByIds(Collection<Uuid> topicIds, DescribeTopicsOptions options) {
Expand Down
15 changes: 15 additions & 0 deletions core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,21 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest {
assertFutureExceptionTypeEquals(results.get(nonExistingTopicId), classOf[UnknownTopicIdException])
}

@ParameterizedTest
@ValueSource(strings = Array("zk", "kraft"))
def testDescribeTopicsWithNames(quorum: String): Unit = {
client = createAdminClient

val existingTopic = "existing-topic"
client.createTopics(Seq(existingTopic).map(new NewTopic(_, 1, 1.toShort)).asJava).all.get()
waitForTopics(client, Seq(existingTopic), List())
ensureConsistentKRaftMetadata()

val existingTopicId = brokers.head.metadataCache.getTopicId(existingTopic)
val results = client.describeTopics(TopicCollection.ofTopicNames(Seq(existingTopic).asJava)).topicNameValues()
assertEquals(existingTopicId, results.get(existingTopic).get.topicId())
}

@ParameterizedTest
@ValueSource(strings = Array("zk", "kraft"))
def testDescribeCluster(quorum: String): Unit = {
Expand Down