diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 6b03e582d127e..e1a151c8c4b29 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -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); @@ -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); @@ -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); /* diff --git a/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv b/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv deleted file mode 100644 index 2b049c72d4950..0000000000000 --- a/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv +++ /dev/null @@ -1 +0,0 @@ -8830000 diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv new file mode 100644 index 0000000000000..0ff8fc01e91e4 --- /dev/null +++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv @@ -0,0 +1 @@ +8840008 diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv new file mode 100644 index 0000000000000..9cbaf3dd8c2b0 --- /dev/null +++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv @@ -0,0 +1 @@ +9000015 diff --git a/server/src/main/resources/transport/upper_bounds/8.18.csv b/server/src/main/resources/transport/upper_bounds/8.18.csv index 2f86b67145538..4eb5140004ea6 100644 --- a/server/src/main/resources/transport/upper_bounds/8.18.csv +++ b/server/src/main/resources/transport/upper_bounds/8.18.csv @@ -1 +1 @@ -initial_elasticsearch_8_18_5,8840007 +initial_elasticsearch_8_18_6,8840008 diff --git a/server/src/main/resources/transport/upper_bounds/9.0.csv b/server/src/main/resources/transport/upper_bounds/9.0.csv index e0a322af52ba5..f8f50cc6d7839 100644 --- a/server/src/main/resources/transport/upper_bounds/9.0.csv +++ b/server/src/main/resources/transport/upper_bounds/9.0.csv @@ -1 +1 @@ -initial_elasticsearch_9_0_5,9000014 +initial_elasticsearch_9_0_6,9000015 diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java index c23a939715b5b..586a55f9289e6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java @@ -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; @@ -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; @@ -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 diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java index 03332b5ddca9a..f9c0627ed0f5e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java @@ -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; /** @@ -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;