Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8830000
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -60,7 +61,7 @@ public MlIndexRollover(List<IndexPatternAndAlias> 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
Expand Down