mimaison commented on a change in pull request #8295:
URL: https://github.com/apache/kafka/pull/8295#discussion_r464884697
##########
File path:
clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
##########
@@ -3973,25 +3977,38 @@ void handleResponse(AbstractResponse abstractResponse) {
ListOffsetResponse response = (ListOffsetResponse)
abstractResponse;
Map<TopicPartition, OffsetSpec> retryTopicPartitionOffsets
= new HashMap<>();
- for (Entry<TopicPartition, PartitionData> result :
response.responseData().entrySet()) {
- TopicPartition tp = result.getKey();
- PartitionData partitionData = result.getValue();
-
- KafkaFutureImpl<ListOffsetsResultInfo> future =
futures.get(tp);
- Errors error = partitionData.error;
- OffsetSpec offsetRequestSpec =
topicPartitionOffsets.get(tp);
- if (offsetRequestSpec == null) {
- future.completeExceptionally(new
KafkaException("Unexpected topic partition " + tp + " in broker response!"));
- } else if
(MetadataOperationContext.shouldRefreshMetadata(error)) {
- retryTopicPartitionOffsets.put(tp,
offsetRequestSpec);
- } else if (error == Errors.NONE) {
- future.complete(new
ListOffsetsResultInfo(partitionData.offset, partitionData.timestamp,
partitionData.leaderEpoch));
- } else {
- future.completeExceptionally(error.exception());
+ for (ListOffsetTopicResponse topic : response.topics()) {
+ for (ListOffsetPartitionResponse partition :
topic.partitions()) {
+ TopicPartition tp = new
TopicPartition(topic.name(), partition.partitionIndex());
+ KafkaFutureImpl<ListOffsetsResultInfo> future =
futures.get(tp);
+ Errors error =
Errors.forCode(partition.errorCode());
+ OffsetSpec offsetRequestSpec =
topicPartitionOffsets.get(tp);
+ if (offsetRequestSpec == null) {
+ log.warn("Server response mentioned unknown
topic partition {}", tp);
+ } else if
(MetadataOperationContext.shouldRefreshMetadata(error)) {
+ retryTopicPartitionOffsets.put(tp,
offsetRequestSpec);
+ } else if (error == Errors.NONE) {
+ Optional<Integer> leaderEpoch =
(partition.leaderEpoch() == ListOffsetResponse.UNKNOWN_EPOCH)
+ ? Optional.empty()
+ : Optional.of(partition.leaderEpoch());
+ future.complete(new
ListOffsetsResultInfo(partition.offset(), partition.timestamp(), leaderEpoch));
+ } else {
+
future.completeExceptionally(error.exception());
+ }
}
}
- if (!retryTopicPartitionOffsets.isEmpty()) {
+ if (retryTopicPartitionOffsets.isEmpty()) {
Review comment:
@dajac suggested that earlier too but here we need to get the unrealized
future for the current broker. So it turned out it's easier to do the current
logic than use `completeUnrealizedFutures()` here
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
