squah-confluent commented on code in PR #20055: URL: https://github.com/apache/kafka/pull/20055#discussion_r2174237852
########## jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/CurrentAssignmentBuilderBenchmark.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.jmh.assignor; + +import org.apache.kafka.common.Uuid; +import org.apache.kafka.coordinator.group.modern.Assignment; +import org.apache.kafka.coordinator.group.modern.MemberState; +import org.apache.kafka.coordinator.group.modern.consumer.ConsumerGroupMember; +import org.apache.kafka.coordinator.group.modern.consumer.CurrentAssignmentBuilder; +import org.apache.kafka.image.MetadataImage; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +@State(Scope.Benchmark) +@Fork(value = 1) +@Warmup(iterations = 5) +@Measurement(iterations = 5) +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(TimeUnit.MILLISECONDS) +public class CurrentAssignmentBuilderBenchmark { + + @Param({"5", "50"}) + private int partitionsPerTopic; + + @Param({"10", "100", "1000"}) + private int topicCount; + + private List<String> topicNames; + + private List<Uuid> topicIds; + + private MetadataImage metadataImage; + + private ConsumerGroupMember member; + + private ConsumerGroupMember memberWithUnsubscribedTopics; + + private Assignment targetAssignment; + + @Setup(Level.Trial) + public void setup() { + setupTopics(); + setupMember(); + setupTargetAssignment(); + } + + private void setupTopics() { + topicNames = AssignorBenchmarkUtils.createTopicNames(topicCount); + topicIds = new ArrayList<>(topicCount); + metadataImage = AssignorBenchmarkUtils.createMetadataImage(topicNames, partitionsPerTopic); + + for (String topicName : topicNames) { + Uuid topicId = metadataImage.topics().topicNameToIdView().get(topicName); + topicIds.add(topicId); + } + } + + private void setupMember() { + Map<Uuid, Set<Integer>> assignedPartitions = new HashMap<>(); + for (Uuid topicId : topicIds) { + Set<Integer> partitions = IntStream.range(0, partitionsPerTopic) + .boxed() + .collect(Collectors.toSet()); + assignedPartitions.put(topicId, partitions); + } + + ConsumerGroupMember.Builder memberBuilder = new ConsumerGroupMember.Builder("member") + .setState(MemberState.STABLE) + .setMemberEpoch(10) + .setPreviousMemberEpoch(10) + .setSubscribedTopicNames(topicNames) + .setAssignedPartitions(assignedPartitions); + + member = memberBuilder.build(); + memberWithUnsubscribedTopics = memberBuilder + .setSubscribedTopicNames(topicNames.subList(0, topicNames.size() - 1)) + .build(); + } + + private void setupTargetAssignment() { + Map<Uuid, Set<Integer>> assignedPartitions = new HashMap<>(); + for (Uuid topicId : topicIds) { + Set<Integer> partitions = IntStream.range(0, partitionsPerTopic) + .boxed() + .collect(Collectors.toSet()); + assignedPartitions.put(topicId, partitions); + } + targetAssignment = new Assignment(assignedPartitions); + } + + @Benchmark + @Threads(1) + @OutputTimeUnit(TimeUnit.MILLISECONDS) + public ConsumerGroupMember stableToStableWithNoChange() { + return new CurrentAssignmentBuilder(member) + .withMetadataImage(metadataImage) + .withTargetAssignment(member.memberEpoch(), targetAssignment) + .withCurrentPartitionEpoch((topicId, partitionId) -> -1) + .build(); + } Review Comment: This benchmark case should be a no-op and pretty fast. ########## group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java: ########## @@ -20437,6 +20435,65 @@ barTopicName, computeTopicHash(barTopicName, metadataImage) ), task.result.records() ); + + assignor.prepareGroupAssignment(new GroupAssignment(Map.of( + memberId1, new MemberAssignmentImpl(mkAssignment( + mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5), + mkTopicAssignment(barTopicId, 0, 1, 2) + )) + ))); + + // Member heartbeats again with the same regex. + CoordinatorResult<ConsumerGroupHeartbeatResponseData, CoordinatorRecord> result2 = context.consumerGroupHeartbeat( + new ConsumerGroupHeartbeatRequestData() + .setGroupId(groupId) + .setMemberId(memberId1) + .setMemberEpoch(10) + .setRebalanceTimeoutMs(5000) + .setSubscribedTopicRegex("foo*|bar*") + .setServerAssignor("range") + .setTopicPartitions(List.of())); + + assertResponseEquals( + new ConsumerGroupHeartbeatResponseData() + .setMemberId(memberId1) + .setMemberEpoch(11) + .setHeartbeatIntervalMs(5000) + .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment() + .setTopicPartitions(List.of( + new ConsumerGroupHeartbeatResponseData.TopicPartitions() + .setTopicId(fooTopicId) + .setPartitions(List.of(0, 1, 2, 3, 4, 5)), + new ConsumerGroupHeartbeatResponseData.TopicPartitions() + .setTopicId(barTopicId) + .setPartitions(List.of(0, 1, 2))))), + result2.response() + ); + + ConsumerGroupMember expectedMember2 = new ConsumerGroupMember.Builder(memberId1) + .setState(MemberState.STABLE) + .setMemberEpoch(11) + .setPreviousMemberEpoch(10) + .setClientId(DEFAULT_CLIENT_ID) + .setClientHost(DEFAULT_CLIENT_ADDRESS.toString()) + .setRebalanceTimeoutMs(5000) + .setSubscribedTopicRegex("foo*|bar*") + .setServerAssignorName("range") + .setAssignedPartitions(mkAssignment( + mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5), + mkTopicAssignment(barTopicId, 0, 1, 2))) + .build(); + + expectedRecords = List.of( + GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentRecord(groupId, memberId1, mkAssignment( + mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5), + mkTopicAssignment(barTopicId, 0, 1, 2) + )), + GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochRecord(groupId, 11), + GroupCoordinatorRecordHelpers.newConsumerGroupCurrentAssignmentRecord(groupId, expectedMember2) + ); + + assertRecordsEquals(expectedRecords, result2.records()); Review Comment: I added testing for completion of the regex update, from the next assignment computation to the end of the heartbeat with the updated assignment. ########## group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java: ########## @@ -20382,19 +20382,15 @@ public void testConsumerGroupMemberJoinsWithUpdatedRegex() { .setMemberEpoch(10) .setHeartbeatIntervalMs(5000) .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment() - .setTopicPartitions(List.of( - new ConsumerGroupHeartbeatResponseData.TopicPartitions() - .setTopicId(fooTopicId) - .setPartitions(List.of(0, 1, 2, 3, 4, 5)) - )) + .setTopicPartitions(List.of()) ), - result.response() + result1.response() ); ConsumerGroupMember expectedMember1 = new ConsumerGroupMember.Builder(memberId1) .setState(MemberState.STABLE) .setMemberEpoch(10) - .setPreviousMemberEpoch(0) + .setPreviousMemberEpoch(10) Review Comment: This looks like a mistake in the existing test. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
