Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KAFKA-16139: Fix StreamsUpgradeTest #15199

Merged
merged 1 commit into from Jan 17, 2024
Merged

KAFKA-16139: Fix StreamsUpgradeTest #15199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
View file
Open in desktop
Expand Up @@ -71,6 +71,7 @@
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.parseType;
import static org.apache.kafka.streams.internals.UpgradeFromValues.UPGRADE_FROM_35;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After merging and doing the follow up PR to add 3.6, I realized that using this import is not what we want to do.

Call for review (follow up cleanup PR): #15208


/**
* Configuration for a {@link KafkaStreams} instance.
Expand Down Expand Up @@ -762,7 +763,8 @@ public class StreamsConfig extends AbstractConfig {
UPGRADE_FROM_22 + "\", \"" + UPGRADE_FROM_23 + "\", \"" + UPGRADE_FROM_24 + "\", \"" +
UPGRADE_FROM_25 + "\", \"" + UPGRADE_FROM_26 + "\", \"" + UPGRADE_FROM_27 + "\", \"" +
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} */
@SuppressWarnings("WeakerAccess")
Expand Down
3 changes: 2 additions & 1 deletion streams/src/main/java/org/apache/kafka/streams/internals/UpgradeFromValues.java
View file
Open in desktop
Expand Up @@ -36,7 +36,8 @@ public enum UpgradeFromValues {
UPGRADE_FROM_31("3.1"),
UPGRADE_FROM_32("3.2"),
UPGRADE_FROM_33("3.3"),
UPGRADE_FROM_34("3.4");
UPGRADE_FROM_34("3.4"),
UPGRADE_FROM_35("3.5");

private final String value;

Expand Down
2 changes: 2 additions & 0 deletions ...n/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java
View file
Open in desktop
Expand Up @@ -125,6 +125,7 @@ public RebalanceProtocol rebalanceProtocol() {
case UPGRADE_FROM_32:
case UPGRADE_FROM_33:
case UPGRADE_FROM_34:
case UPGRADE_FROM_35:
// 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
Expand Down Expand Up @@ -183,6 +184,7 @@ public int configuredMetadataVersion(final int priorVersion) {
case UPGRADE_FROM_32:
case UPGRADE_FROM_33:
case UPGRADE_FROM_34:
case UPGRADE_FROM_35:
// 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
Expand Down