Skip to content

Commit f7faaae

Browse files
authored
Bootstrap initial versions to simplify transport version migration (#134084) (#134150)
This reverts our other bootstrapping of file-based transport versions to make migration simpler moving forward and adds the initial version one prior to the last initial version for each of 9.1, 9.0, 8.19, and 8.18.
1 parent 081e848 commit f7faaae

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ static TransportVersion def(int id) {
173173
public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
174174
public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
175175
public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
176+
public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
176177
public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
177178
public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
178179
public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
@@ -189,7 +190,6 @@ static TransportVersion def(int id) {
189190
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04);
190191
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_3 = def(8_840_0_05);
191192
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_4 = def(8_840_0_06);
192-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08);
193193
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_7 = def(8_840_0_09);
194194

195195
/*

server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8840008
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
initial_elasticsearch_8_18_5,8840007
1+
initial_elasticsearch_8_18_6,8840008

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.Arrays;
4141
import java.util.List;
4242

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

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

55-
private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");
56-
5756
private final IndexNameExpressionResolver expressionResolver;
5857
private final OriginSettingClient client;
5958

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

7271
@Override

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.ArrayList;
2929
import java.util.List;
3030

31+
import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES;
3132
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
3233

3334
/**
@@ -41,8 +42,6 @@ public class MlIndexRollover implements MlAutoUpdateService.UpdateAction {
4142

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

44-
private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");
45-
4645
public record IndexPatternAndAlias(String indexPattern, String alias) {}
4746

4847
private final IndexNameExpressionResolver expressionResolver;

0 commit comments

Comments
 (0)