Skip to content

Commit b46e0ce

Browse files
authored
migrate ml_rollover_legacy_indices transport version (#133008)
1 parent 8036a08 commit b46e0ce

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ static TransportVersion def(int id) {
132132
public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
133133
public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
134134
public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
135-
public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
136135
public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
137136
public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
138137
public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8830000

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.ElasticsearchStatusException;
1212
import org.elasticsearch.ResourceAlreadyExistsException;
1313
import org.elasticsearch.TransportVersion;
14-
import org.elasticsearch.TransportVersions;
1514
import org.elasticsearch.action.ActionListener;
1615
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
1716
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
@@ -53,6 +52,8 @@ public class MlAnomaliesIndexUpdate implements MlAutoUpdateService.UpdateAction
5352

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

55+
private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");
56+
5657
private final IndexNameExpressionResolver expressionResolver;
5758
private final OriginSettingClient client;
5859

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

7172
@Override

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.elasticsearch.ElasticsearchException;
1111
import org.elasticsearch.ElasticsearchStatusException;
1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.ActionListener;
1514
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
1615
import org.elasticsearch.action.support.IndicesOptions;
@@ -44,6 +43,8 @@ public class MlIndexRollover implements MlAutoUpdateService.UpdateAction {
4443

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

46+
private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");
47+
4748
public record IndexPatternAndAlias(String indexPattern, String alias) {}
4849

4950
private final IndexNameExpressionResolver expressionResolver;
@@ -60,7 +61,7 @@ public MlIndexRollover(List<IndexPatternAndAlias> indicesToRollover, IndexNameEx
6061
public boolean isMinTransportVersionSupported(TransportVersion minTransportVersion) {
6162
// Wait for all nodes to be upgraded to ensure that the
6263
// newly created index will be of the latest version.
63-
return minTransportVersion.onOrAfter(TransportVersions.ML_ROLLOVER_LEGACY_INDICES);
64+
return minTransportVersion.supports(ML_ROLLOVER_LEGACY_INDICES);
6465
}
6566

6667
@Override

0 commit comments

Comments
 (0)