mirror of https://github.com/apache/kafka.git
KAFKA-14514; Add Range Assignor on the Server (KIP-848) (#13443)
This patch adds the RangeAssignor on the server for KIP-848. This range assignor is very different from the old client side implementation. We added functionality to make these assignments sticky while also inheriting crucial properties of the range assignor such as facilitating joins and distributing partitions of a topic somewhat equally amongst its subscribers. Reviewers: Philip Nee <philipnee@gmail.com>, Jeff Kim <jeff.kim@confluent.io>, David Jacot <djacot@confluent.io>
This commit is contained in:
Ritika Reddy
GitHub
parent
625ef176ee
commit
4653507926
|
|
@ -0,0 +1,220 @@
|
||||||
|
/*
|
||||||
|
* 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.coordinator.group.assignor;
|
||||||
|
|
||||||
|
import org.apache.kafka.common.Uuid;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static java.lang.Math.min;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This Range Assignor inherits properties of both the range assignor and the sticky assignor.
|
||||||
|
* The properties are as follows:
|
||||||
|
* <ol>
|
||||||
|
* <li> Each member must get at least one partition from every topic that it is subscribed to. The only exception is when
|
||||||
|
* the number of subscribed members is greater than the number of partitions for that topic. (Range) </li>
|
||||||
|
* <li> Partitions should be assigned to members in a way that facilitates the join operation when required. (Range)
|
||||||
|
* This can only be done if every member is subscribed to the same topics and the topics are co-partitioned.
|
||||||
|
* Two streams are co-partitioned if the following conditions are met:
|
||||||
|
* <ul>
|
||||||
|
* <li> The keys must have the same schemas. </li>
|
||||||
|
* <li> The topics involved must have the same number of partitions. </li>
|
||||||
|
* </ul>
|
||||||
|
* </li>
|
||||||
|
* <li> Members should retain as much of their previous assignment as possible to reduce the number of partition
|
||||||
|
* movements during reassignment. (Sticky) </li>
|
||||||
|
* </ol>
|
||||||
|
*/
|
||||||
|
public class RangeAssignor implements PartitionAssignor {
|
||||||
|
public static final String RANGE_ASSIGNOR_NAME = "range";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String name() {
|
||||||
|
return RANGE_ASSIGNOR_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pair of memberId and remaining partitions to meet the quota.
|
||||||
|
*/
|
||||||
|
private static class MemberWithRemainingAssignments {
|
||||||
|
/**
|
||||||
|
* Member Id.
|
||||||
|
*/
|
||||||
|
private final String memberId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of partitions required to meet the assignment quota.
|
||||||
|
*/
|
||||||
|
private final int remaining;
|
||||||
|
|
||||||
|
public MemberWithRemainingAssignments(String memberId, int remaining) {
|
||||||
|
this.memberId = memberId;
|
||||||
|
this.remaining = remaining;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Map of topic ids to a list of members subscribed to them.
|
||||||
|
*/
|
||||||
|
private Map<Uuid, List<String>> membersPerTopic(final AssignmentSpec assignmentSpec) {
|
||||||
|
Map<Uuid, List<String>> membersPerTopic = new HashMap<>();
|
||||||
|
Map<String, AssignmentMemberSpec> membersData = assignmentSpec.members();
|
||||||
|
|
||||||
|
membersData.forEach((memberId, memberMetadata) -> {
|
||||||
|
Collection<Uuid> topics = memberMetadata.subscribedTopicIds();
|
||||||
|
for (Uuid topicId : topics) {
|
||||||
|
// Only topics that are present in both the subscribed topics list and the topic metadata should be
|
||||||
|
// considered for assignment.
|
||||||
|
if (assignmentSpec.topics().containsKey(topicId)) {
|
||||||
|
membersPerTopic
|
||||||
|
.computeIfAbsent(topicId, k -> new ArrayList<>())
|
||||||
|
.add(memberId);
|
||||||
|
} else {
|
||||||
|
throw new PartitionAssignorException("Member " + memberId + " subscribed to topic " +
|
||||||
|
topicId + " which doesn't exist in the topic metadata");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return membersPerTopic;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The algorithm includes the following steps:
|
||||||
|
* <ol>
|
||||||
|
* <li> Generate a map of members per topic using the given member subscriptions. </li>
|
||||||
|
* <li> Generate a list of members called potentially unfilled members, which consists of members that have not
|
||||||
|
* met the minimum required quota of partitions for the assignment AND get a list called assigned sticky
|
||||||
|
* partitions for topic, which has the partitions that will be retained in the new assignment. </li>
|
||||||
|
* <li> Generate a list of unassigned partitions by calculating the difference between the total partitions
|
||||||
|
* for the topic and the assigned (sticky) partitions. </li>
|
||||||
|
* <li> Find members from the potentially unfilled members list that haven't met the total required quota
|
||||||
|
* i.e. minRequiredQuota + 1, if the member is designated to receive one of the excess partitions OR
|
||||||
|
* minRequiredQuota otherwise. </li>
|
||||||
|
* <li> Assign partitions to them in ranges from the unassigned partitions per topic
|
||||||
|
* based on the remaining partitions value. </li>
|
||||||
|
* </ol>
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public GroupAssignment assign(final AssignmentSpec assignmentSpec) throws PartitionAssignorException {
|
||||||
|
Map<String, MemberAssignment> newAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
// Step 1
|
||||||
|
Map<Uuid, List<String>> membersPerTopic = membersPerTopic(assignmentSpec);
|
||||||
|
|
||||||
|
membersPerTopic.forEach((topicId, membersForTopic) -> {
|
||||||
|
int numPartitionsForTopic = assignmentSpec.topics().get(topicId).numPartitions();
|
||||||
|
int minRequiredQuota = numPartitionsForTopic / membersForTopic.size();
|
||||||
|
// Each member can get only ONE extra partition per topic after receiving the minimum quota.
|
||||||
|
int numMembersWithExtraPartition = numPartitionsForTopic % membersForTopic.size();
|
||||||
|
|
||||||
|
// Step 2
|
||||||
|
Set<Integer> assignedStickyPartitionsForTopic = new HashSet<>();
|
||||||
|
List<MemberWithRemainingAssignments> potentiallyUnfilledMembers = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String memberId : membersForTopic) {
|
||||||
|
Set<Integer> assignedPartitionsForTopic = assignmentSpec.members().get(memberId)
|
||||||
|
.assignedPartitions().getOrDefault(topicId, Collections.emptySet());
|
||||||
|
|
||||||
|
int currentAssignmentSize = assignedPartitionsForTopic.size();
|
||||||
|
List<Integer> currentAssignmentListForTopic = new ArrayList<>(assignedPartitionsForTopic);
|
||||||
|
|
||||||
|
// If there were partitions from this topic that were previously assigned to this member, retain as many as possible.
|
||||||
|
// Sort the current assignment in ascending order since we want the same partition numbers from each topic
|
||||||
|
// to go to the same member, in order to facilitate joins in case of co-partitioned topics.
|
||||||
|
if (currentAssignmentSize > 0) {
|
||||||
|
int retainedPartitionsCount = min(currentAssignmentSize, minRequiredQuota);
|
||||||
|
Collections.sort(currentAssignmentListForTopic);
|
||||||
|
for (int i = 0; i < retainedPartitionsCount; i++) {
|
||||||
|
assignedStickyPartitionsForTopic
|
||||||
|
.add(currentAssignmentListForTopic.get(i));
|
||||||
|
newAssignment.computeIfAbsent(memberId, k -> new MemberAssignment(new HashMap<>()))
|
||||||
|
.targetPartitions()
|
||||||
|
.computeIfAbsent(topicId, k -> new HashSet<>())
|
||||||
|
.add(currentAssignmentListForTopic.get(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Number of partitions required to meet the minRequiredQuota.
|
||||||
|
// There are 3 cases w.r.t the value of remaining:
|
||||||
|
// 1) remaining < 0: this means that the member has more than the min required amount.
|
||||||
|
// 2) If remaining = 0: member has the minimum required partitions, but it may get an extra partition, so it is a potentially unfilled member.
|
||||||
|
// 3) If remaining > 0: member doesn't have the minimum required partitions, so it should be added to potentiallyUnfilledMembers.
|
||||||
|
int remaining = minRequiredQuota - currentAssignmentSize;
|
||||||
|
|
||||||
|
// Retain extra partitions as well when applicable.
|
||||||
|
if (remaining < 0 && numMembersWithExtraPartition > 0) {
|
||||||
|
numMembersWithExtraPartition--;
|
||||||
|
// Since we already added the minimumRequiredQuota of partitions in the previous step (until minReq - 1), we just need to
|
||||||
|
// add the extra partition that will be present at the index right after min quota was satisfied.
|
||||||
|
assignedStickyPartitionsForTopic
|
||||||
|
.add(currentAssignmentListForTopic.get(minRequiredQuota));
|
||||||
|
newAssignment.computeIfAbsent(memberId, k -> new MemberAssignment(new HashMap<>()))
|
||||||
|
.targetPartitions()
|
||||||
|
.computeIfAbsent(topicId, k -> new HashSet<>())
|
||||||
|
.add(currentAssignmentListForTopic.get(minRequiredQuota));
|
||||||
|
} else {
|
||||||
|
MemberWithRemainingAssignments newPair = new MemberWithRemainingAssignments(memberId, remaining);
|
||||||
|
potentiallyUnfilledMembers.add(newPair);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 3
|
||||||
|
// Find the difference between the total partitions per topic and the already assigned sticky partitions for the topic to get the unassigned partitions.
|
||||||
|
// List of unassigned partitions for topic contains the partitions in ascending order.
|
||||||
|
List<Integer> unassignedPartitionsForTopic = new ArrayList<>();
|
||||||
|
for (int i = 0; i < numPartitionsForTopic; i++) {
|
||||||
|
if (!assignedStickyPartitionsForTopic.contains(i)) {
|
||||||
|
unassignedPartitionsForTopic.add(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 4 and Step 5
|
||||||
|
// Account for the extra partitions if necessary and increase the required quota by 1.
|
||||||
|
// If remaining > 0 after increasing the required quota, assign the remaining number of partitions from the unassigned partitions list.
|
||||||
|
int unassignedPartitionsListStartPointer = 0;
|
||||||
|
for (MemberWithRemainingAssignments pair : potentiallyUnfilledMembers) {
|
||||||
|
String memberId = pair.memberId;
|
||||||
|
int remaining = pair.remaining;
|
||||||
|
if (numMembersWithExtraPartition > 0) {
|
||||||
|
remaining++;
|
||||||
|
numMembersWithExtraPartition--;
|
||||||
|
}
|
||||||
|
if (remaining > 0) {
|
||||||
|
List<Integer> partitionsToAssign = unassignedPartitionsForTopic
|
||||||
|
.subList(unassignedPartitionsListStartPointer, unassignedPartitionsListStartPointer + remaining);
|
||||||
|
unassignedPartitionsListStartPointer += remaining;
|
||||||
|
newAssignment.computeIfAbsent(memberId, k -> new MemberAssignment(new HashMap<>()))
|
||||||
|
.targetPartitions()
|
||||||
|
.computeIfAbsent(topicId, k -> new HashSet<>())
|
||||||
|
.addAll(partitionsToAssign);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return new GroupAssignment(newAssignment);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.apache.kafka.coordinator.group.consumer;
|
package org.apache.kafka.coordinator.group;
|
||||||
|
|
||||||
import org.apache.kafka.common.Uuid;
|
import org.apache.kafka.common.Uuid;
|
||||||
|
|
||||||
|
|
@ -44,9 +44,9 @@ import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkSortedAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkSortedAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkSortedTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkSortedTopicAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.RecordHelpers.newCurrentAssignmentRecord;
|
import static org.apache.kafka.coordinator.group.RecordHelpers.newCurrentAssignmentRecord;
|
||||||
import static org.apache.kafka.coordinator.group.RecordHelpers.newCurrentAssignmentTombstoneRecord;
|
import static org.apache.kafka.coordinator.group.RecordHelpers.newCurrentAssignmentTombstoneRecord;
|
||||||
import static org.apache.kafka.coordinator.group.RecordHelpers.newGroupEpochRecord;
|
import static org.apache.kafka.coordinator.group.RecordHelpers.newGroupEpochRecord;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,574 @@
|
||||||
|
/*
|
||||||
|
* 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.coordinator.group.assignor;
|
||||||
|
|
||||||
|
import org.apache.kafka.common.Uuid;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkAssignment;
|
||||||
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
|
||||||
|
public class RangeAssignorTest {
|
||||||
|
private final RangeAssignor assignor = new RangeAssignor();
|
||||||
|
private final Uuid topic1Uuid = Uuid.randomUuid();
|
||||||
|
private final Uuid topic2Uuid = Uuid.randomUuid();
|
||||||
|
private final Uuid topic3Uuid = Uuid.randomUuid();
|
||||||
|
private final String consumerA = "A";
|
||||||
|
private final String consumerB = "B";
|
||||||
|
private final String consumerC = "C";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testOneConsumerNoTopic() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = Collections.singletonMap(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
Map<String, AssignmentMemberSpec> members = Collections.singletonMap(
|
||||||
|
consumerA,
|
||||||
|
new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.emptyList(),
|
||||||
|
Collections.emptyMap()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment groupAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
assertEquals(Collections.emptyMap(), groupAssignment.members());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testOneConsumerSubscribedToNonExistentTopic() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = Collections.singletonMap(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
Map<String, AssignmentMemberSpec> members = Collections.singletonMap(
|
||||||
|
consumerA,
|
||||||
|
new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.singletonList(topic2Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
|
||||||
|
assertThrows(PartitionAssignorException.class,
|
||||||
|
() -> assignor.assign(assignmentSpec));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFirstAssignmentTwoConsumersTwoTopicsSameSubscriptions() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic3Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic3Uuid, 0)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic3Uuid, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFirstAssignmentThreeConsumersThreeTopicsDifferentSubscriptions() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic3Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.singletonList(topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic2Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic3Uuid, 0)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerC, mkAssignment(
|
||||||
|
mkTopicAssignment(topic2Uuid, 2),
|
||||||
|
mkTopicAssignment(topic3Uuid, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFirstAssignmentNumConsumersGreaterThanNumPartitions() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic3Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic3Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
// Topic 3 has 2 partitions but three consumers subscribed to it - one of them will not get a partition.
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0),
|
||||||
|
mkTopicAssignment(topic3Uuid, 0)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 1),
|
||||||
|
mkTopicAssignment(topic3Uuid, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerC, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentNumConsumersGreaterThanNumPartitionsWhenOneConsumerAdded() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForA = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForA
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
// Add a new consumer to trigger a re-assignment
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
// Consumer C shouldn't get any assignment, due to stickiness A, B retain their assignments
|
||||||
|
assertNull(computedAssignment.members().get(consumerC));
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentWhenOnePartitionAddedForTwoConsumersTwoTopics() {
|
||||||
|
// Simulating adding a partition - originally T1 -> 3 Partitions and T2 -> 3 Partitions
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(4));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(4));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForA = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForA
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2, 3),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2, 3)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentWhenOneConsumerAddedAfterInitialAssignmentWithTwoConsumersTwoTopics() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForA = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForA
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
// Add a new consumer to trigger a re-assignment
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerC, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentWhenOneConsumerAddedAndOnePartitionAfterInitialAssignmentWithTwoConsumersTwoTopics() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
// Add a new partition to topic 1, initially T1 -> 3 partitions
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(4));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForA = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForA
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
// Add a new consumer to trigger a re-assignment
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.singletonList(topic1Uuid),
|
||||||
|
Collections.emptyMap()
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerC, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 3)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentWhenOneConsumerRemovedAfterInitialAssignmentWithTwoConsumersTwoTopics() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
// Consumer A was removed
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1, 2)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReassignmentWhenMultipleSubscriptionsRemovedAfterInitialAssignmentWithThreeConsumersTwoTopics() {
|
||||||
|
Map<Uuid, AssignmentTopicMetadata> topics = new HashMap<>();
|
||||||
|
topics.put(topic1Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic2Uuid, new AssignmentTopicMetadata(3));
|
||||||
|
topics.put(topic3Uuid, new AssignmentTopicMetadata(2));
|
||||||
|
|
||||||
|
Map<String, AssignmentMemberSpec> members = new TreeMap<>();
|
||||||
|
|
||||||
|
// Let initial subscriptions be A -> T1, T2 // B -> T2 // C -> T2, T3
|
||||||
|
// Change the subscriptions to A -> T1 // B -> T1, T2, T3 // C -> T2
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForA = mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerA, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.singletonList(topic1Uuid),
|
||||||
|
currentAssignmentForA
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForB = mkAssignment(
|
||||||
|
mkTopicAssignment(topic2Uuid, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerB, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Arrays.asList(topic1Uuid, topic2Uuid, topic3Uuid),
|
||||||
|
currentAssignmentForB
|
||||||
|
));
|
||||||
|
|
||||||
|
Map<Uuid, Set<Integer>> currentAssignmentForC = mkAssignment(
|
||||||
|
mkTopicAssignment(topic2Uuid, 2),
|
||||||
|
mkTopicAssignment(topic3Uuid, 0, 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
members.put(consumerC, new AssignmentMemberSpec(
|
||||||
|
Optional.empty(),
|
||||||
|
Optional.empty(),
|
||||||
|
Collections.singletonList(topic2Uuid),
|
||||||
|
currentAssignmentForC
|
||||||
|
));
|
||||||
|
|
||||||
|
AssignmentSpec assignmentSpec = new AssignmentSpec(members, topics);
|
||||||
|
GroupAssignment computedAssignment = assignor.assign(assignmentSpec);
|
||||||
|
|
||||||
|
Map<String, Map<Uuid, Set<Integer>>> expectedAssignment = new HashMap<>();
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerA, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 0, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerB, mkAssignment(
|
||||||
|
mkTopicAssignment(topic1Uuid, 2),
|
||||||
|
mkTopicAssignment(topic2Uuid, 0, 1),
|
||||||
|
mkTopicAssignment(topic3Uuid, 0, 1)
|
||||||
|
));
|
||||||
|
|
||||||
|
expectedAssignment.put(consumerC, mkAssignment(
|
||||||
|
mkTopicAssignment(topic2Uuid, 2)
|
||||||
|
));
|
||||||
|
|
||||||
|
assertAssignment(expectedAssignment, computedAssignment);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertAssignment(Map<String, Map<Uuid, Set<Integer>>> expectedAssignment, GroupAssignment computedGroupAssignment) {
|
||||||
|
assertEquals(expectedAssignment.size(), computedGroupAssignment.members().size());
|
||||||
|
for (String memberId : computedGroupAssignment.members().keySet()) {
|
||||||
|
Map<Uuid, Set<Integer>> computedAssignmentForMember = computedGroupAssignment.members().get(memberId).targetPartitions();
|
||||||
|
assertEquals(expectedAssignment.get(memberId), computedAssignmentForMember);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -29,8 +29,8 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ import java.util.Collections;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.OptionalInt;
|
import java.util.OptionalInt;
|
||||||
|
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
public class ConsumerGroupMemberTest {
|
public class ConsumerGroupMemberTest {
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@ import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
public class CurrentAssignmentBuilderTest {
|
public class CurrentAssignmentBuilderTest {
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment;
|
import static org.apache.kafka.coordinator.group.AssignmentTestUtil.mkTopicAssignment;
|
||||||
import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentEpochRecord;
|
import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentEpochRecord;
|
||||||
import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentRecord;
|
import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentRecord;
|
||||||
import static org.apache.kafka.coordinator.group.consumer.TargetAssignmentBuilder.createAssignmentMemberSpec;
|
import static org.apache.kafka.coordinator.group.consumer.TargetAssignmentBuilder.createAssignmentMemberSpec;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue