Skip to content

[9.0] Bootstrap initial versions to simplify transport version migration (#134084) #134144

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

Merged
merged 1 commit into from
Sep 4, 2025
Merged

[9.0] Bootstrap initial versions to simplify transport version migration (#134084) #134144

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
Expand All @@ -185,7 +186,6 @@ static TransportVersion def(int id) {
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_3 = def(8_840_0_05);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_4 = def(8_840_0_06);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_7 = def(8_840_0_09);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
Expand All @@ -202,7 +202,6 @@ static TransportVersion def(int id) {
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_4 = def(9_000_0_13);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_6 = def(9_000_0_15);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_7 = def(9_000_0_16);

/*
Expand Down
1 change: 0 additions & 1 deletion server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8840008
1 change: 1 addition & 0 deletions server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9000015
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/8.18.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
initial_elasticsearch_8_18_5,8840007
initial_elasticsearch_8_18_6,8840008
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/9.0.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
initial_elasticsearch_9_0_5,9000014
initial_elasticsearch_9_0_6,9000015
5 changes: 2 additions & 3 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.Arrays;
import java.util.List;

import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES;
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.FIRST_INDEX_SIX_DIGIT_SUFFIX;
import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.has6DigitSuffix;
Expand All @@ -52,8 +53,6 @@ public class MlAnomaliesIndexUpdate implements MlAutoUpdateService.UpdateAction

private static final Logger logger = LogManager.getLogger(MlAnomaliesIndexUpdate.class);

private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");

private final IndexNameExpressionResolver expressionResolver;
private final OriginSettingClient client;

Expand All @@ -66,7 +65,7 @@ public MlAnomaliesIndexUpdate(IndexNameExpressionResolver expressionResolver, Cl
public boolean isMinTransportVersionSupported(TransportVersion minTransportVersion) {
// Automatic rollover does not require any new features
// but wait for all nodes to be upgraded anyway
return minTransportVersion.supports(ML_ROLLOVER_LEGACY_INDICES);
return minTransportVersion.onOrAfter(ML_ROLLOVER_LEGACY_INDICES);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;

import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES;
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;

/**
Expand All @@ -43,8 +44,6 @@ public class MlIndexRollover implements MlAutoUpdateService.UpdateAction {

private static final Logger logger = LogManager.getLogger(MlIndexRollover.class);

private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");

public record IndexPatternAndAlias(String indexPattern, String alias) {}

private final IndexNameExpressionResolver expressionResolver;
Expand Down