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 <junrao@apache.org>
This commit is contained in:
Justine Olshan 2024-08-16 17:29:08 -07:00 committed by GitHub
parent 2a6f449af7
commit fd544024aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -23,8 +23,8 @@ public enum TestFeatureVersion implements FeatureVersion {
TEST_0(0, MetadataVersion.MINIMUM_KRAFT_VERSION, Collections.emptyMap()), 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 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_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 is not yet released and maps to the latest testing version, 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(2, MetadataVersion.latestTesting(), Collections.singletonMap(MetadataVersion.FEATURE_NAME, MetadataVersion.latestTesting().featureLevel()));
private final short featureLevel; private final short featureLevel;
private final MetadataVersion metadataVersionMapping; private final MetadataVersion metadataVersionMapping;

View File

@ -123,7 +123,7 @@ public class FeaturesTest {
@EnumSource(MetadataVersion.class) @EnumSource(MetadataVersion.class)
public void testDefaultTestVersion(MetadataVersion metadataVersion) { public void testDefaultTestVersion(MetadataVersion metadataVersion) {
short expectedVersion; short expectedVersion;
if (!metadataVersion.isLessThan(MetadataVersion.IBP_4_0_IV0)) { if (!metadataVersion.isLessThan(MetadataVersion.latestTesting())) {
expectedVersion = 2; expectedVersion = 2;
} else if (!metadataVersion.isLessThan(MetadataVersion.IBP_3_7_IV0)) { } else if (!metadataVersion.isLessThan(MetadataVersion.IBP_3_7_IV0)) {
expectedVersion = 1; expectedVersion = 1;