root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

KAFKA-16139: Fix StreamsUpgradeTest (#15199) 

Adds version 3.5 to the possible values for config upgrade_from.

Reviewers: Matthias J. Sax <matthias@confluent.io>
This commit is contained in:
Bruno Cadonna 2024-01-17 02:25:33 +01:00 committed by Matthias J. Sax
parent b403683308
commit 091d5570a8
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
View File

@ -71,6 +71,7 @@ import static org.apache.kafka.common.config.ConfigDef.Range.atLeast;
import static org.apache.kafka.common.config.ConfigDef.Range.between; import static org.apache.kafka.common.config.ConfigDef.Range.between;
import static org.apache.kafka.common.config.ConfigDef.ValidString.in; import static org.apache.kafka.common.config.ConfigDef.ValidString.in;
import static org.apache.kafka.common.config.ConfigDef.parseType; import static org.apache.kafka.common.config.ConfigDef.parseType;
import static org.apache.kafka.streams.internals.UpgradeFromValues.UPGRADE_FROM_35;
/** /**
* Configuration for a {@link KafkaStreams} instance. * Configuration for a {@link KafkaStreams} instance.
@ -762,7 +763,8 @@ public class StreamsConfig extends AbstractConfig {
UPGRADE_FROM_22 + "\", \"" + UPGRADE_FROM_23 + "\", \"" + UPGRADE_FROM_24 + "\", \"" + UPGRADE_FROM_22 + "\", \"" + UPGRADE_FROM_23 + "\", \"" + UPGRADE_FROM_24 + "\", \"" +
UPGRADE_FROM_25 + "\", \"" + UPGRADE_FROM_26 + "\", \"" + UPGRADE_FROM_27 + "\", \"" + UPGRADE_FROM_25 + "\", \"" + UPGRADE_FROM_26 + "\", \"" + UPGRADE_FROM_27 + "\", \"" +
UPGRADE_FROM_28 + "\", \"" + UPGRADE_FROM_30 + "\", \"" + UPGRADE_FROM_31 + "\", \"" + UPGRADE_FROM_28 + "\", \"" + UPGRADE_FROM_30 + "\", \"" + UPGRADE_FROM_31 + "\", \"" +
UPGRADE_FROM_32 + "\", \"" + UPGRADE_FROM_33 + "\", \"" + UPGRADE_FROM_34 + "\" (for upgrading from the corresponding old version)."; UPGRADE_FROM_32 + "\", \"" + UPGRADE_FROM_33 + "\", \"" + UPGRADE_FROM_34 + "\", \"" +
UPGRADE_FROM_35 + "(for upgrading from the corresponding old version).";
/** {@code windowstore.changelog.additional.retention.ms} */ /** {@code windowstore.changelog.additional.retention.ms} */
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")

3
streams/src/main/java/org/apache/kafka/streams/internals/UpgradeFromValues.java
View File

@ -36,7 +36,8 @@ public enum UpgradeFromValues {
UPGRADE_FROM_31("3.1"), UPGRADE_FROM_31("3.1"),
UPGRADE_FROM_32("3.2"), UPGRADE_FROM_32("3.2"),
UPGRADE_FROM_33("3.3"), UPGRADE_FROM_33("3.3"),
UPGRADE_FROM_34("3.4"); UPGRADE_FROM_34("3.4"),
UPGRADE_FROM_35("3.5");
private final String value; private final String value;

2
streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java
View File

@ -125,6 +125,7 @@ public final class AssignorConfiguration {
case UPGRADE_FROM_32: case UPGRADE_FROM_32:
case UPGRADE_FROM_33: case UPGRADE_FROM_33:
case UPGRADE_FROM_34: case UPGRADE_FROM_34:
case UPGRADE_FROM_35:
// we need to add new version when new "upgrade.from" values become available // we need to add new version when new "upgrade.from" values become available
// This config is for explicitly sending FK response to a requested partition // This config is for explicitly sending FK response to a requested partition
@ -183,6 +184,7 @@ public final class AssignorConfiguration {
case UPGRADE_FROM_32: case UPGRADE_FROM_32:
case UPGRADE_FROM_33: case UPGRADE_FROM_33:
case UPGRADE_FROM_34: case UPGRADE_FROM_34:
case UPGRADE_FROM_35:
// we need to add new version when new "upgrade.from" values become available // we need to add new version when new "upgrade.from" values become available
// This config is for explicitly sending FK response to a requested partition // This config is for explicitly sending FK response to a requested partition