rreddy-22 commented on code in PR #13443: URL: https://github.com/apache/kafka/pull/13443#discussion_r1188821932
########## group-coordinator/src/test/java/org/apache/kafka/coordinator/group/assignor/RangeAssignorTest.java: ########## @@ -0,0 +1,523 @@ +/* + * 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.HashSet; +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.assertTrue; + +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); + GroupAssignment groupAssignment = assignor.assign(assignmentSpec); + + assertTrue(groupAssignment.members().isEmpty()); + } + + @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<>(); + // Topic 1 Partitions Assignment + expectedAssignment.put(consumerA, mkAssignment(mkTopicAssignment(topic1Uuid, 0, 1))); + expectedAssignment.put(consumerB, mkAssignment(mkTopicAssignment(topic1Uuid, 2))); + // Topic 3 Partitions Assignment + expectedAssignment.get(consumerA).putAll(mkAssignment(mkTopicAssignment(topic3Uuid, 0))); + expectedAssignment.get(consumerB).putAll(mkAssignment(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<>(); + // Topic 1 Partitions Assignment + expectedAssignment.put(consumerA, mkAssignment(mkTopicAssignment(topic1Uuid, 0, 1, 2))); + // Topic 2 Partitions Assignment + expectedAssignment.get(consumerA).putAll(mkAssignment(mkTopicAssignment(topic2Uuid, 0, 1))); + expectedAssignment.put(consumerC, mkAssignment(mkTopicAssignment(topic2Uuid, 2))); + // Topic 3 Partitions Assignment + expectedAssignment.put(consumerB, mkAssignment(mkTopicAssignment(topic3Uuid, 0))); + expectedAssignment.get(consumerC).putAll(mkAssignment(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. + // Topic 1 Partitions Assignment + expectedAssignment.put(consumerA, mkAssignment(mkTopicAssignment(topic1Uuid, 0))); + expectedAssignment.put(consumerB, mkAssignment(mkTopicAssignment(topic1Uuid, 1))); + expectedAssignment.put(consumerC, mkAssignment(mkTopicAssignment(topic1Uuid, 2))); + // Topic 3 Partitions Assignment + expectedAssignment.get(consumerA).putAll(mkAssignment(mkTopicAssignment(topic3Uuid, 0))); + expectedAssignment.get(consumerB).putAll(mkAssignment(mkTopicAssignment(topic3Uuid, 1))); + + 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 = new HashMap<>(); + currentAssignmentForA.put(topic1Uuid, Collections.singleton(0)); + currentAssignmentForA.put(topic2Uuid, Collections.singleton(0)); + members.put(consumerA, new AssignmentMemberSpec( + Optional.empty(), + Optional.empty(), + Arrays.asList(topic1Uuid, topic2Uuid), + currentAssignmentForA + )); + + Map<Uuid, Set<Integer>> currentAssignmentForB = new HashMap<>(); + currentAssignmentForB.put(topic1Uuid, Collections.singleton(1)); + currentAssignmentForB.put(topic2Uuid, Collections.singleton(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<>(); + // Topic 1 Partitions Assignment + expectedAssignment.put(consumerA, mkAssignment(mkTopicAssignment(topic1Uuid, 0))); + expectedAssignment.put(consumerB, mkAssignment(mkTopicAssignment(topic1Uuid, 1))); + // Topic 2 Partitions Assignment + expectedAssignment.get(consumerA).putAll(mkAssignment(mkTopicAssignment(topic2Uuid, 0))); + expectedAssignment.get(consumerB).putAll(mkAssignment(mkTopicAssignment(topic2Uuid, 1))); + + // Consumer C shouldn't get any assignment, due to stickiness A, B retain their assignments + assertNull(computedAssignment.members().get(consumerC)); Review Comment: That's what I asked and you had told me that either way is fine. I can change it to anything depending on how the rest of the code works -- 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. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
