Skip to content

KAFKA-9073: check assignment in requestFailed to avoid NPE #7630

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
guozhangwang merged 2 commits into from
Dec 4, 2019
Merged

KAFKA-9073: check assignment in requestFailed to avoid NPE #7630

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
354c3bf
cherry-pick from trunk
guozhangwang Nov 1, 2019
59ef902
add another bug fix
guozhangwang Nov 2, 2019
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
7 changes: 5 additions & 2 deletions clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,11 @@ private static class MetadataSnapshot {

private MetadataSnapshot(SubscriptionState subscription, Cluster cluster, int version) {
Map<String, Integer> partitionsPerTopic = new HashMap<>();
for (String topic : subscription.groupSubscription())
partitionsPerTopic.put(topic, cluster.partitionCountForTopic(topic));
for (String topic : subscription.groupSubscription()) {
Integer numPartitions = cluster.partitionCountForTopic(topic);
if (numPartitions != null)
partitionsPerTopic.put(topic, numPartitions);
}
this.partitionsPerTopic = partitionsPerTopic;
this.version = version;
}
Expand Down
9 changes: 7 additions & 2 deletions clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,13 @@ public synchronized void resume(TopicPartition tp) {
}

synchronized void requestFailed(Set<TopicPartition> partitions, long nextRetryTimeMs) {
for (TopicPartition partition : partitions)
assignedState(partition).requestFailed(nextRetryTimeMs);
for (TopicPartition partition : partitions) {
// by the time the request failed, the assignment may no longer
// contain this partition any more, in which case we would just ignore.
final TopicPartitionState state = assignedStateOrNull(partition);
if (state != null)
state.requestFailed(nextRetryTimeMs);
}
}

synchronized void movePartitionToEnd(TopicPartition tp) {
Expand Down
2 changes: 1 addition & 1 deletion clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void partitionAssignment() {
state.seek(tp0, 1);
assertTrue(state.isFetchable(tp0));
assertEquals(1L, state.position(tp0).offset);
state.assignFromUser(Collections.<TopicPartition>emptySet());
state.assignFromUser(Collections.emptySet());
assertTrue(state.assignedPartitions().isEmpty());
assertEquals(0, state.numAssignedPartitions());
assertFalse(state.isAssigned(tp0));
Expand Down