junrao commented on code in PR #15673:
URL: https://github.com/apache/kafka/pull/15673#discussion_r1628455890
##########
server-common/src/main/java/org/apache/kafka/server/common/TestFeatureVersion.java:
##########
@@ -24,7 +24,7 @@ public enum TestFeatureVersion implements FeatureVersion {
// TEST_1 released right before MV 3.7-IVO was released, and it has no
dependencies
TEST_1(1, MetadataVersion.IBP_3_7_IV0, Collections.emptyMap()),
// TEST_2 released right before MV 3.8-IVO was released, and it depends on
this metadata version
- TEST_2(2, MetadataVersion.IBP_3_8_IV0,
Collections.singletonMap(MetadataVersion.FEATURE_NAME,
MetadataVersion.IBP_3_8_IV0.featureLevel()));
+ TEST_2(2, MetadataVersion.IBP_4_0_IV0,
Collections.singletonMap(MetadataVersion.FEATURE_NAME,
MetadataVersion.IBP_4_0_IV0.featureLevel()));
Review Comment:
Could we adjust the comment above on "MV 3.8-IVO"?
##########
metadata/src/test/java/org/apache/kafka/metadata/PartitionRegistrationTest.java:
##########
@@ -283,7 +283,7 @@ private static Stream<Arguments>
metadataVersionsForTestPartitionRegistration()
return Stream.of(
MetadataVersion.IBP_3_7_IV1,
MetadataVersion.IBP_3_7_IV2,
- MetadataVersion.IBP_3_8_IV0
+ MetadataVersion.IBP_3_8_IV1
Review Comment:
This corresponds to ELR and needs to be changed to BP_4_0_IV0 like
PartitionChangeBuilderTest.java. Ditto below.
@CalvinConfluent : Could you confirm that? Also, could you check if there is
any other change needed for ELR in this PR?
##########
server-common/src/main/java/org/apache/kafka/server/common/MetadataVersion.java:
##########
@@ -201,11 +201,15 @@ public enum MetadataVersion {
// Add new fetch request version for KIP-951
IBP_3_7_IV4(19, "3.7", "IV4", false),
- // Add ELR related supports (KIP-966).
+ // Similar to IBP_3_7_IV3, IBP_3_8_IV0 was reserved for ELR support
(KIP-966) but has
+ // been moved forward to a later release requiring a new MetadataVersion.
IBP_3_8_IV0(20, "3.8", "IV0", true),
+ // Add ListOffsets V9 (KIP-1005)
+ IBP_3_8_IV1(21, "3.8", "IV1", false),
+
// Introduce version 1 of the GroupVersion feature (KIP-848).
- IBP_4_0_IV0(21, "4.0", "IV0", false);
+ IBP_4_0_IV0(22, "4.0", "IV0", false);
Review Comment:
Perhaps we could add a comment that IBP_4_0_IV0 also corresponds to ELR for
now. @CalvinConfluent : Is this ok with you for now?
##########
tools/src/test/java/org/apache/kafka/tools/FeatureCommandTest.java:
##########
@@ -69,10 +69,10 @@ public void testDescribeWithKRaft(ClusterInstance cluster) {
// Change expected message to reflect latest MetadataVersion
(SupportedMaxVersion increases when adding a new version)
assertEquals("Feature: metadata.version\tSupportedMinVersion:
3.0-IV1\t" +
- "SupportedMaxVersion: 4.0-IV0\tFinalizedVersionLevel:
3.3-IV1\t", outputWithoutEpoch(features.get(1)));
+ "SupportedMaxVersion: 3.8-IV1\tFinalizedVersionLevel:
3.3-IV1\t", outputWithoutEpoch(features.get(1)));
Review Comment:
The test seems to fail with this change. This test is configured with
unstable.feature.versions.enable=true. So, returning 4.0-IV0 for max supported
version is correct.
--
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
