Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static class TimestampSpec extends OffsetSpec {
this.timestamp = timestamp;
}

long timestamp() {
public long timestamp() {
Comment thread
dengziming marked this conversation as resolved.
Outdated
return timestamp;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.kafka.common.Node;
import org.apache.kafka.common.errors.DisconnectException;
import org.apache.kafka.common.errors.UnsupportedVersionException;
import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.AbstractResponse;
import org.apache.kafka.common.requests.FindCoordinatorRequest.NoBatchedFindCoordinatorsException;
Expand Down Expand Up @@ -260,12 +261,18 @@ public void onFailure(
.filter(future.lookupKeys()::contains)
.collect(Collectors.toSet());
retryLookup(keysToUnmap);
} else if (t instanceof UnsupportedVersionException) {
Comment thread
dengziming marked this conversation as resolved.
Map<K, Throwable> unrecoverableFailures =
handler.handleUnsupportedVersionException(
(UnsupportedVersionException) t,
spec.keys,
spec.scope instanceof FulfillmentScope);
Comment thread
dimitarndimitrov marked this conversation as resolved.
Outdated
completeExceptionally(unrecoverableFailures);
} else {
Map<K, Throwable> errors = spec.keys.stream().collect(Collectors.toMap(
Function.identity(),
key -> t
));

if (spec.scope instanceof FulfillmentScope) {
completeExceptionally(errors);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.kafka.clients.admin.internals;

import org.apache.kafka.common.Node;
import org.apache.kafka.common.errors.UnsupportedVersionException;
import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.AbstractResponse;

Expand Down Expand Up @@ -70,6 +71,24 @@ public interface AdminApiHandler<K, V> {
*/
ApiResult<K, V> handleResponse(Node broker, Set<K> keys, AbstractResponse response);

/**
* Callback that is invoked when a request hits an UnsupportedVersionException. Keys for which the
* exception cannot be handled and the request shouldn't be retried must be mapped to an error and
* returned. The request will then be retried for the remainder of the keys. If the exception is
* thrown during the lookup stage the handler should delegate the handling to the lookup strategy.
*
* @return The failure mappings for the keys for which the exception cannot be handled and the
* request shouldn't be retried. If the exception cannot be handled all initial keys will be in
* the returned map.
*/
default Map<K, Throwable> handleUnsupportedVersionException(
UnsupportedVersionException exception,
Set<K> keys,
boolean isFulfillmentStage
) {
return keys.stream().collect(Collectors.toMap(k -> k, k -> exception));
}

/**
* Get the lookup strategy that is responsible for finding the brokerId
* which will handle each respective key.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.clients.admin.internals;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.kafka.clients.admin.ListOffsetsOptions;
import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
import org.apache.kafka.clients.admin.OffsetSpec;
import org.apache.kafka.clients.admin.OffsetSpec.TimestampSpec;
import org.apache.kafka.clients.admin.internals.AdminApiFuture.SimpleAdminApiFuture;
import org.apache.kafka.clients.admin.internals.AdminApiHandler.Batched;
import org.apache.kafka.common.Node;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.errors.ApiException;
import org.apache.kafka.common.errors.InvalidMetadataException;
import org.apache.kafka.common.errors.RetriableException;
import org.apache.kafka.common.errors.UnsupportedVersionException;
import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsPartition;
import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsTopic;
import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse;
import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsTopicResponse;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.AbstractResponse;
import org.apache.kafka.common.requests.ListOffsetsRequest;
import org.apache.kafka.common.requests.ListOffsetsResponse;
import org.apache.kafka.common.utils.CollectionUtils;
import org.apache.kafka.common.utils.LogContext;
import org.slf4j.Logger;

public final class ListOffsetsHandler extends Batched<TopicPartition, ListOffsetsResultInfo> {

private final Map<TopicPartition, OffsetSpec> offsetSpecsByPartition;
Comment thread
dengziming marked this conversation as resolved.
Outdated
private final ListOffsetsOptions options;
private final Logger log;
private final AdminApiLookupStrategy<TopicPartition> lookupStrategy;

public ListOffsetsHandler(
Map<TopicPartition, OffsetSpec> offsetSpecsByPartition,
ListOffsetsOptions options,
LogContext logContext
) {
this.offsetSpecsByPartition = offsetSpecsByPartition;
this.options = options;
this.log = logContext.logger(ListOffsetsHandler.class);
this.lookupStrategy = new PartitionLeaderStrategy(logContext);
}

@Override
public String apiName() {
return "listOffsets";
}

@Override
public AdminApiLookupStrategy<TopicPartition> lookupStrategy() {
return this.lookupStrategy;
}

@Override
ListOffsetsRequest.Builder buildBatchedRequest(int brokerId, Set<TopicPartition> keys) {
Map<String, ListOffsetsTopic> topicsByName = CollectionUtils.groupPartitionsByTopic(
keys,
topicName -> new ListOffsetsTopic().setName(topicName),
(listOffsetsTopic, partitionId) -> {
TopicPartition topicPartition = new TopicPartition(listOffsetsTopic.name(), partitionId);
OffsetSpec offsetSpec = offsetSpecsByPartition.get(topicPartition);
long offsetQuery = getOffsetFromSpec(offsetSpec);
listOffsetsTopic.partitions().add(
new ListOffsetsPartition()
.setPartitionIndex(partitionId)
.setTimestamp(offsetQuery));
});
boolean supportsMaxTimestamp = keys
Comment thread
dimitarndimitrov marked this conversation as resolved.
.stream()
.anyMatch(key -> getOffsetFromSpec(offsetSpecsByPartition.get(key)) == ListOffsetsRequest.MAX_TIMESTAMP);

return ListOffsetsRequest.Builder
.forConsumer(true, options.isolationLevel(), supportsMaxTimestamp)
.setTargetTimes(new ArrayList<>(topicsByName.values()));
}

@Override
public ApiResult<TopicPartition, ListOffsetsResultInfo> handleResponse(
Node broker,
Set<TopicPartition> keys,
AbstractResponse abstractResponse
) {
ListOffsetsResponse response = (ListOffsetsResponse) abstractResponse;
Map<TopicPartition, ListOffsetsResultInfo> completed = new HashMap<>();
Map<TopicPartition, Throwable> failed = new HashMap<>();
List<TopicPartition> unmapped = new ArrayList<>();
Set<TopicPartition> retriable = new HashSet<>();

for (ListOffsetsTopicResponse topic : response.topics()) {
for (ListOffsetsPartitionResponse partition : topic.partitions()) {
TopicPartition topicPartition = new TopicPartition(topic.name(), partition.partitionIndex());
Errors error = Errors.forCode(partition.errorCode());
OffsetSpec offsetRequestSpec = offsetSpecsByPartition.get(topicPartition);
if (offsetRequestSpec == null) {
log.warn("ListOffsets response includes unknown topic partition {}", topicPartition);
} else if (error == Errors.NONE) {
Optional<Integer> leaderEpoch = (partition.leaderEpoch() == ListOffsetsResponse.UNKNOWN_EPOCH)
? Optional.empty()
: Optional.of(partition.leaderEpoch());
completed.put(
topicPartition,
new ListOffsetsResultInfo(partition.offset(), partition.timestamp(), leaderEpoch));
} else {
handlePartitionError(topicPartition, error, failed, unmapped, retriable);
}
}
}

// Sanity-check if the current leader for these partitions returned results for all of them
for (TopicPartition topicPartition : keys) {
if (unmapped.isEmpty()
&& !completed.containsKey(topicPartition)
&& !failed.containsKey(topicPartition)
&& !retriable.contains(topicPartition)
) {
ApiException sanityCheckException = new ApiException(
"The response from broker " + broker.id() +
" did not contain a result for topic partition " + topicPartition);
log.error(
"ListOffsets request for topic partition {} failed sanity check",
topicPartition,
sanityCheckException);
failed.put(topicPartition, sanityCheckException);
}
}

return new ApiResult<>(completed, failed, unmapped);
}

private void handlePartitionError(
TopicPartition topicPartition,
Errors error,
Map<TopicPartition, Throwable> failed,
List<TopicPartition> unmapped,
Set<TopicPartition> retriable
) {
ApiException apiException = error.exception();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I recommend to use Errors directly and not to use error.exception(), error.exception() will use defaultExceptionString, here we have more information, you can refer to ListConsumerGroupOffsetsHandler.handleGroupError as an exapmle.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dengziming I've replaced error.exception() with the Errors instance in all logging here as well as in the comparison for the first case. I have to continue using error.exception() for the RetriableException matching (and the failed map).

if (apiException instanceof InvalidMetadataException) {
log.debug(
"ListOffsets lookup request for topic partition {} will be retried due to invalid metadata",
topicPartition,
apiException);
unmapped.add(topicPartition);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a little radical to retry on all kinds of InvalidMetadataException, but it's OK to do this to avoid too much if else.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rechecked the old logic of KafkaAdminClient.getListOffsetsCalls, we firstly find the leader of each partition and invoke completeExceptionally if a partition are not bind to a leader, there is no logic of retrying lookup a leader for a partition, so it's OK even not to retry lookup, right?

I think we should be careful to retry from lookup after inspecting all possible exceptions in KafkaApis.handleListOffsetRequest, it's only necessary to retry onNotLeaderOrFollowerException and LeaderNotAvailableException, and for other MetadataException, for example, KafkaStorageException, it's nonsense to retry.
In the long run, we can maintain this information in each lookupStrategy, but for now, we just retry on these 2 cases similar to DescribeProducersHandler and DescribeTransactionsHandler.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

In the long run, we can maintain this information in each lookupStrategy, but for now, we just retry on these 2 cases similar to DescribeProducersHandler and DescribeTransactionsHandler.

Wouldn't we have to keep that code in the handlers as well, as the metadata changes might have happened after the lookup stage has completed? Or do you mean abstracting the handling of failures that require unmapping in a common method of the lookup strategy?

} else if (apiException instanceof RetriableException) {
log.debug(
"ListOffsets fulfillment request for topic partition {} will be retried due to {}",
topicPartition,
apiException);
retriable.add(topicPartition);
} else {
log.error(
"ListOffsets request for topic partition {} failed due to an unexpected error",
topicPartition,
apiException);
failed.put(topicPartition, apiException);
}
}

@Override
public Map<TopicPartition, Throwable> handleUnsupportedVersionException(
UnsupportedVersionException exception, Set<TopicPartition> keys, boolean isFulfillmentStage
) {
// An UnsupportedVersionException can be addressed only in the fulfillment stage...
if (!isFulfillmentStage) {
return keys.stream().collect(Collectors.toMap(k -> k, k -> exception));
}
Map<TopicPartition, Throwable> maxTimestampPartitions = new HashMap<>();
boolean containsNonMaxTimestampSpec = false;
for (TopicPartition topicPartition : keys) {
OffsetSpec offsetSpec = offsetSpecsByPartition.get(topicPartition);
if (getOffsetFromSpec(offsetSpec) == ListOffsetsRequest.MAX_TIMESTAMP) {
maxTimestampPartitions.put(topicPartition, exception);
} else {
containsNonMaxTimestampSpec = true;
}
}
// ...only if it's caused by a MAX_TIMESTAMP spec for some partition, and only if there is at least
// one other partition with a non-MAX_TIMESTAMP spec for which the fulfillment stage can be retried.
if (maxTimestampPartitions.isEmpty() || !containsNonMaxTimestampSpec) {
return keys.stream().collect(Collectors.toMap(k -> k, k -> exception));
Comment thread
dengziming marked this conversation as resolved.
} else {
return maxTimestampPartitions;
}
}

public static SimpleAdminApiFuture<TopicPartition, ListOffsetsResultInfo> newFuture(
Collection<TopicPartition> topicPartitions
) {
return AdminApiFuture.forKeys(new HashSet<>(topicPartitions));
}

// Visible for testing
static long getOffsetFromSpec(OffsetSpec offsetSpec) {
if (offsetSpec instanceof TimestampSpec) {
return ((TimestampSpec) offsetSpec).timestamp();
} else if (offsetSpec instanceof OffsetSpec.EarliestSpec) {
return ListOffsetsRequest.EARLIEST_TIMESTAMP;
} else if (offsetSpec instanceof OffsetSpec.MaxTimestampSpec) {
return ListOffsetsRequest.MAX_TIMESTAMP;
}
return ListOffsetsRequest.LATEST_TIMESTAMP;
}
}

This file was deleted.

Loading