chia7712 commented on code in PR #23610:
URL: https://github.com/apache/kafka/pull/23610#discussion_r4274481007


##########
metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriterTest.java:
##########
@@ -98,9 +98,66 @@ public void iterateTopics(EnumSet<TopicVisitorInterest> 
interests, TopicVisitor
         writer.handleSnapshot(image, (opType, opLog, operation) ->
             operation.apply(ZkMigrationLeadershipState.EMPTY)
         );
-        assertEquals(topicClient.updatedTopics.get("foo").size(), 3);
+        assertEquals(3, topicClient.updatedTopics.get("foo").size());
+        assertEquals(Collections.singleton(3), 
topicClient.deletedTopicPartitions.get("foo"));
+        // Partition 1 is missing from ZK, so it must be created rather than 
updated
+        assertEquals(Collections.singleton(1), 
topicClient.newTopicPartitions.get("foo"));
+        assertTrue(topicClient.updatedTopicPartitions.isEmpty());
+    }
+
+    /**
+     * If ZK has extraneous partitions but is not missing any, no partitions 
should be created.
+     */
+    @Test
+    public void testOnlyExtraneousZkPartitions() {
+        CapturingTopicMigrationClient topicClient = new 
CapturingTopicMigrationClient() {
+            @Override
+            public void iterateTopics(EnumSet<TopicVisitorInterest> interests, 
TopicVisitor visitor) {
+                Map<Integer, List<Integer>> assignments = new HashMap<>();
+                assignments.put(0, Arrays.asList(2, 3, 4));
+                assignments.put(1, Arrays.asList(3, 4, 5));
+                assignments.put(2, Arrays.asList(2, 4, 5));
+                assignments.put(3, Arrays.asList(1, 2, 3)); // This one is not 
in KRaft
+                visitor.visitTopic("foo", TopicsImageTest.FOO_UUID, 
assignments);
+
+                IntStream.of(0, 1, 2, 3).forEach(partitionId ->
+                    visitor.visitPartition(
+                        new TopicIdPartition(TopicsImageTest.FOO_UUID, new 
TopicPartition("foo", partitionId)),
+                        
TopicsImageTest.IMAGE1.getPartition(TopicsImageTest.FOO_UUID, partitionId)
+                    )
+                );
+            }
+        };
+
+        CapturingConfigMigrationClient configClient = new 
CapturingConfigMigrationClient();
+        CapturingMigrationClient migrationClient = 
CapturingMigrationClient.newBuilder()
+            .setBrokersInZk(0)
+            .setTopicMigrationClient(topicClient)
+            .setConfigMigrationClient(configClient)
+            .build();
+
+        KRaftMigrationZkWriter writer = new 
KRaftMigrationZkWriter(migrationClient, __ -> { });
+
+        MetadataImage image = new MetadataImage(
+            MetadataProvenance.EMPTY,
+            FeaturesImage.EMPTY,
+            ClusterImage.EMPTY,
+            TopicsImageTest.IMAGE1,     // This includes "foo" with 3 
partitions
+            ConfigurationsImage.EMPTY,
+            ClientQuotasImage.EMPTY,
+            ProducerIdsImage.EMPTY,
+            AclsImage.EMPTY,
+            ScramImage.EMPTY,
+            DelegationTokenImage.EMPTY
+        );
+
+        writer.handleSnapshot(image, (opType, opLog, operation) ->
+            operation.apply(ZkMigrationLeadershipState.EMPTY)
+        );
+        assertEquals(3, topicClient.updatedTopics.get("foo").size());
         assertEquals(topicClient.deletedTopicPartitions.get("foo"), 
Collections.singleton(3));

Review Comment:
   the argument order needs to be fixed :)



##########
core/src/main/scala/kafka/zk/ZkMigrationClient.scala:
##########
@@ -147,7 +146,9 @@ class ZkMigrationClient(
   ): Unit = wrapZkException {
     var topicBatch = new util.ArrayList[ApiMessageAndVersion]()
     topicClient.iterateTopics(
-      util.EnumSet.allOf(classOf[TopicVisitorInterest]),
+      util.EnumSet.of(

Review Comment:
   We don't need this change, 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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to