From c957bd7dd5e3c32d2b60de7c661a90e29f18bdeb Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Fri, 15 Aug 2025 13:30:39 -0700 Subject: [PATCH] migrate ml_rollover_legacy_indices transport version --- .../src/main/java/org/elasticsearch/TransportVersions.java | 1 - .../definitions/named/ml_rollover_legacy_indices.csv | 1 + .../org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java | 5 +++-- .../java/org/elasticsearch/xpack/ml/MlIndexRollover.java | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 server/src/main/resources/transport/definitions/named/ml_rollover_legacy_indices.csv diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index f5283510bd1c9..6c6c0822678c9 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -132,7 +132,6 @@ 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); diff --git a/server/src/main/resources/transport/definitions/named/ml_rollover_legacy_indices.csv b/server/src/main/resources/transport/definitions/named/ml_rollover_legacy_indices.csv new file mode 100644 index 0000000000000..2b049c72d4950 --- /dev/null +++ b/server/src/main/resources/transport/definitions/named/ml_rollover_legacy_indices.csv @@ -0,0 +1 @@ +8830000 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 26e0246312e1c..fb20a22a258d5 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 @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; @@ -53,6 +52,8 @@ 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; @@ -65,7 +66,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.onOrAfter(TransportVersions.ML_ROLLOVER_LEGACY_INDICES); + return minTransportVersion.supports(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 05eefe174dbab..ba47fa5558cf9 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 @@ -10,7 +10,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.rollover.RolloverRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -44,6 +43,8 @@ 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; @@ -60,7 +61,7 @@ public MlIndexRollover(List indicesToRollover, IndexNameEx public boolean isMinTransportVersionSupported(TransportVersion minTransportVersion) { // Wait for all nodes to be upgraded to ensure that the // newly created index will be of the latest version. - return minTransportVersion.onOrAfter(TransportVersions.ML_ROLLOVER_LEGACY_INDICES); + return minTransportVersion.supports(ML_ROLLOVER_LEGACY_INDICES); } @Override