jolshan commented on code in PR #13638: URL: https://github.com/apache/kafka/pull/13638#discussion_r1184401478
########## group-coordinator/src/test/java/org/apache/kafka/coordinator/group/consumer/CurrentAssignmentBuilderTest.java: ########## @@ -0,0 +1,548 @@ +/* + * 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.consumer; + +import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.message.ConsumerGroupHeartbeatRequestData; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment; +import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class CurrentAssignmentBuilderTest { + + @Test + public void testTransitionFromNewTargetToRevoke() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(10) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> 10) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(10, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6) + ), updatedMember.assignedPartitions()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5) + ), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromNewTargetToAssigning() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(10) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3, 4, 5), + mkTopicAssignment(topicId2, 4, 5, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> 10) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.ASSIGNING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(11, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromNewTargetToStable() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(10) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(10, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> 10) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(10, updatedMember.memberEpoch()); + assertEquals(10, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 1, 2, 3), + mkTopicAssignment(topicId2, 4, 5, 6) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromRevokeToRevokeWithNull() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingRevocation(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> -1) + .withOwnedTopicPartitions(null) // The client has not revoked yet. + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(10, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6) + ), updatedMember.assignedPartitions()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5) + ), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromRevokeToRevokeWithEmptyList() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingRevocation(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> -1) + .withOwnedTopicPartitions(Collections.emptyList()) // The client has not revoked yet. + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(10, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6) + ), updatedMember.assignedPartitions()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5) + ), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromRevokeToAssigning() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingRevocation(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> 10) + .withOwnedTopicPartitions(requestFromAssignment(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6)))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.ASSIGNING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(11, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromRevokeToStable() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingRevocation(mkAssignment( + mkTopicAssignment(topicId1, 1, 2), + mkTopicAssignment(topicId2, 4, 5))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.REVOKING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> -1) + .withOwnedTopicPartitions(requestFromAssignment(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6)))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(11, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromAssigningToAssigning() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(11) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.ASSIGNING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> { + if (topicId.equals(topicId1)) + return -1; + else + return 10; + }) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.ASSIGNING, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(11, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId2, 7, 8) + ), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromAssigningToStable() { + Uuid topicId1 = Uuid.randomUuid(); + Uuid topicId2 = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member") + .setMemberEpoch(10) + .setPreviousMemberEpoch(11) + .setNextMemberEpoch(11) + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(topicId1, 3), + mkTopicAssignment(topicId2, 6))) + .setPartitionsPendingAssignment(mkAssignment( + mkTopicAssignment(topicId1, 4, 5), + mkTopicAssignment(topicId2, 7, 8))) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.ASSIGNING, member.state()); + + Assignment targetAssignment = new Assignment(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + )); + + ConsumerGroupMember updatedMember = new CurrentAssignmentBuilder(member) + .withTargetAssignment(11, targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> -1) + .build(); + + assertEquals(ConsumerGroupMember.MemberState.STABLE, updatedMember.state()); + assertEquals(10, updatedMember.previousMemberEpoch()); + assertEquals(11, updatedMember.memberEpoch()); + assertEquals(11, updatedMember.nextMemberEpoch()); + assertEquals(mkAssignment( + mkTopicAssignment(topicId1, 3, 4, 5), + mkTopicAssignment(topicId2, 6, 7, 8) + ), updatedMember.assignedPartitions()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingRevocation()); + assertEquals(Collections.emptyMap(), updatedMember.partitionsPendingAssignment()); + } + + @Test + public void testTransitionFromStableToStable() { Review Comment: Is this the right test? Seems like a repeat of the above. I suppose 452 is different, but I would guess from the title that 463 should be STABLE right? -- 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
