You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jo...@apache.org on 2024/08/17 00:29:14 UTC
(kafka) branch trunk updated: Make TestFeatureVersion 2 always map to MetadataVersion.latestTesting (#16901)
This is an automated email from the ASF dual-hosted git repository.
jolshan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new fd544024aa0 Make TestFeatureVersion 2 always map to MetadataVersion.latestTesting (#16901)
fd544024aa0 is described below
commit fd544024aa033155a672e0919310f424835c41eb
Author: Justine Olshan <jo...@confluent.io>
AuthorDate: Fri Aug 16 17:29:08 2024 -0700
Make TestFeatureVersion 2 always map to MetadataVersion.latestTesting (#16901)
After some discussion on: https://github.com/apache/kafka/pull/16841#discussion_r1714322320
We decided it is best for test version to always map to MetadataVersion.latestTesting. We should always have one unstable MV (either because there is a feature being worked on OR when we mark the latest version stable we create a new one).
Reviewers: Jun Rao <ju...@apache.org>
---
.../main/java/org/apache/kafka/server/common/TestFeatureVersion.java | 4 ++--
.../src/test/java/org/apache/kafka/server/common/FeaturesTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server-common/src/main/java/org/apache/kafka/server/common/TestFeatureVersion.java b/server-common/src/main/java/org/apache/kafka/server/common/TestFeatureVersion.java
index 4fffb8ec980..2d929d19897 100644
--- a/server-common/src/main/java/org/apache/kafka/server/common/TestFeatureVersion.java
+++ b/server-common/src/main/java/org/apache/kafka/server/common/TestFeatureVersion.java
@@ -23,8 +23,8 @@ public enum TestFeatureVersion implements FeatureVersion {
TEST_0(0, MetadataVersion.MINIMUM_KRAFT_VERSION, Collections.emptyMap()),
// 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 4.0-IVO was released, and it depends on this metadata version
- TEST_2(2, MetadataVersion.IBP_4_0_IV0, Collections.singletonMap(MetadataVersion.FEATURE_NAME, MetadataVersion.IBP_4_0_IV0.featureLevel()));
+ // TEST_2 is not yet released and maps to the latest testing version, and it depends on this metadata version
+ TEST_2(2, MetadataVersion.latestTesting(), Collections.singletonMap(MetadataVersion.FEATURE_NAME, MetadataVersion.latestTesting().featureLevel()));
private final short featureLevel;
private final MetadataVersion metadataVersionMapping;
diff --git a/server-common/src/test/java/org/apache/kafka/server/common/FeaturesTest.java b/server-common/src/test/java/org/apache/kafka/server/common/FeaturesTest.java
index ca4107d1d59..fb9e947cd69 100644
--- a/server-common/src/test/java/org/apache/kafka/server/common/FeaturesTest.java
+++ b/server-common/src/test/java/org/apache/kafka/server/common/FeaturesTest.java
@@ -123,7 +123,7 @@ public class FeaturesTest {
@EnumSource(MetadataVersion.class)
public void testDefaultTestVersion(MetadataVersion metadataVersion) {
short expectedVersion;
- if (!metadataVersion.isLessThan(MetadataVersion.IBP_4_0_IV0)) {
+ if (!metadataVersion.isLessThan(MetadataVersion.latestTesting())) {
expectedVersion = 2;
} else if (!metadataVersion.isLessThan(MetadataVersion.IBP_3_7_IV0)) {
expectedVersion = 1;