Migrate transport versions 9120_000 through 9126_000 (#134404)

jdconrad · web-flow · commit 3e8b3083600c · 2025-09-09T16:57:59.000-07:00
Migrate transport versions:

    9120_000
    9121_000
    9122_000
    9123_000
    9124_000
    9125_000
    9126_000

ES-12334
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -333,13 +333,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00);
     public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = def(9_118_0_00);
     public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
-    public static final TransportVersion LOOKUP_JOIN_CCS = def(9_120_0_00);
-    public static final TransportVersion NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = def(9_121_0_00);
-    public static final TransportVersion ESQL_CATEGORIZE_OPTIONS = def(9_122_0_00);
-    public static final TransportVersion ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED = def(9_123_0_00);
-    public static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = def(9_124_0_00);
-    public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00);
-    public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
     public static final TransportVersion TIME_SERIES_TELEMETRY = def(9_155_0_00);
     public static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = def(9_156_0_00);
 
diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java b/server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
@@ -9,6 +9,7 @@
 
 package org.elasticsearch.cluster;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.routing.RecoverySource;
 import org.elasticsearch.cluster.routing.ShardRouting;
@@ -48,6 +49,11 @@ public class ClusterInfo implements ChunkedToXContent, Writeable {
 
     public static final ClusterInfo EMPTY = new ClusterInfo();
 
+    private static final TransportVersion NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = TransportVersion.fromName(
+        "node_usage_stats_for_thread_pools_in_cluster_info"
+    );
+    private static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = TransportVersion.fromName("shard_write_load_in_cluster_info");
+
     private final Map<String, DiskUsage> leastAvailableSpaceUsage;
     private final Map<String, DiskUsage> mostAvailableSpaceUsage;
     final Map<String, Long> shardSizes;
@@ -109,12 +115,12 @@ public ClusterInfo(StreamInput in) throws IOException {
         } else {
             this.estimatedHeapUsages = Map.of();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
+        if (in.getTransportVersion().supports(NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
             this.nodeUsageStatsForThreadPools = in.readImmutableMap(NodeUsageStatsForThreadPools::new);
         } else {
             this.nodeUsageStatsForThreadPools = Map.of();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.SHARD_WRITE_LOAD_IN_CLUSTER_INFO)) {
+        if (in.getTransportVersion().supports(SHARD_WRITE_LOAD_IN_CLUSTER_INFO)) {
             this.shardWriteLoads = in.readImmutableMap(ShardId::new, StreamInput::readDouble);
         } else {
             this.shardWriteLoads = Map.of();
@@ -132,10 +138,10 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.HEAP_USAGE_IN_CLUSTER_INFO)) {
             out.writeMap(this.estimatedHeapUsages, StreamOutput::writeWriteable);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
+        if (out.getTransportVersion().supports(NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
             out.writeMap(this.nodeUsageStatsForThreadPools, StreamOutput::writeWriteable);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.SHARD_WRITE_LOAD_IN_CLUSTER_INFO)) {
+        if (out.getTransportVersion().supports(SHARD_WRITE_LOAD_IN_CLUSTER_INFO)) {
             out.writeMap(this.shardWriteLoads, StreamOutput::writeWriteable, StreamOutput::writeDouble);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java b/server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java
@@ -51,6 +51,7 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<Custom> implemen
     public static final ProjectStateRegistry EMPTY = new ProjectStateRegistry(Collections.emptyMap(), Collections.emptySet(), 0);
     private static final Entry EMPTY_ENTRY = new Entry(Settings.EMPTY, ImmutableOpenMap.of());
 
+    private static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = TransportVersion.fromName("project_state_registry_entry");
     private static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = TransportVersion.fromName(
         "project_reserved_state_move_to_registry"
     );
@@ -69,7 +70,7 @@ public static ProjectStateRegistry get(ClusterState clusterState) {
     }
 
     public ProjectStateRegistry(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_ENTRY)) {
+        if (in.getTransportVersion().supports(PROJECT_STATE_REGISTRY_ENTRY)) {
             projectsEntries = in.readMap(ProjectId::readFrom, Entry::readFrom);
         } else {
             Map<ProjectId, Settings> settingsMap = in.readMap(ProjectId::readFrom, Settings::readSettingsFromStream);
@@ -151,7 +152,7 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params
     }
 
     public static NamedDiff<Custom> readDiffFrom(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_ENTRY)) {
+        if (in.getTransportVersion().supports(PROJECT_STATE_REGISTRY_ENTRY)) {
             return new ProjectStateRegistryDiff(in);
         }
         return readDiffFrom(Custom.class, TYPE, in);
@@ -177,7 +178,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_ENTRY)) {
+        if (out.getTransportVersion().supports(PROJECT_STATE_REGISTRY_ENTRY)) {
             out.writeMap(projectsEntries);
         } else {
             Map<ProjectId, Settings> settingsMap = projectsEntries.entrySet()
@@ -254,6 +255,8 @@ static class ProjectStateRegistryDiff implements NamedDiff<Custom> {
             Entry.EntryDiff::readFrom
         );
 
+        private static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = TransportVersion.fromName("project_state_registry_entry");
+
         private final DiffableUtils.MapDiff<ProjectId, Entry, Map<ProjectId, Entry>> projectsEntriesDiff;
         private final Set<ProjectId> projectsMarkedForDeletion;
         private final long projectsMarkedForDeletionGeneration;
@@ -277,7 +280,7 @@ static class ProjectStateRegistryDiff implements NamedDiff<Custom> {
 
         @Override
         public TransportVersion getMinimalSupportedVersion() {
-            return TransportVersions.PROJECT_STATE_REGISTRY_ENTRY;
+            return PROJECT_STATE_REGISTRY_ENTRY;
         }
 
         @Override
diff --git a/server/src/main/resources/transport/definitions/referable/esql_categorize_options.csv b/server/src/main/resources/transport/definitions/referable/esql_categorize_options.csv
@@ -0,0 +1 @@
+9122000
diff --git a/server/src/main/resources/transport/definitions/referable/lookup_join_ccs.csv b/server/src/main/resources/transport/definitions/referable/lookup_join_ccs.csv
@@ -0,0 +1 @@
+9120000
diff --git a/server/src/main/resources/transport/definitions/referable/ml_inference_azure_ai_studio_rerank_added.csv b/server/src/main/resources/transport/definitions/referable/ml_inference_azure_ai_studio_rerank_added.csv
@@ -0,0 +1 @@
+9123000
diff --git a/server/src/main/resources/transport/definitions/referable/ml_inference_llama_added.csv b/server/src/main/resources/transport/definitions/referable/ml_inference_llama_added.csv
@@ -0,0 +1 @@
+9125000
diff --git a/server/src/main/resources/transport/definitions/referable/node_usage_stats_for_thread_pools_in_cluster_info.csv b/server/src/main/resources/transport/definitions/referable/node_usage_stats_for_thread_pools_in_cluster_info.csv
@@ -0,0 +1 @@
+9121000
diff --git a/server/src/main/resources/transport/definitions/referable/project_state_registry_entry.csv b/server/src/main/resources/transport/definitions/referable/project_state_registry_entry.csv
@@ -0,0 +1 @@
+9124000
diff --git a/server/src/main/resources/transport/definitions/referable/shard_write_load_in_cluster_info.csv b/server/src/main/resources/transport/definitions/referable/shard_write_load_in_cluster_info.csv
@@ -0,0 +1 @@
+9126000
diff --git a/server/src/test/java/org/elasticsearch/cluster/project/ProjectStateRegistrySerializationTests.java b/server/src/test/java/org/elasticsearch/cluster/project/ProjectStateRegistrySerializationTests.java
@@ -10,7 +10,6 @@
 package org.elasticsearch.cluster.project;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.ClusterModule;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.Diff;
@@ -28,6 +27,8 @@
 
 public class ProjectStateRegistrySerializationTests extends SimpleDiffableWireSerializationTestCase<ClusterState.Custom> {
 
+    private static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = TransportVersion.fromName("project_state_registry_entry");
+
     @Override
     protected ClusterState.Custom makeTestChanges(ClusterState.Custom testInstance) {
         return mutate((ProjectStateRegistry) testInstance);
@@ -94,7 +95,7 @@ public static Settings randomSettings() {
 
     public void testProjectStateRegistryBwcSerialization() throws IOException {
         ProjectStateRegistry projectStateRegistry = randomProjectStateRegistry();
-        TransportVersion oldVersion = TransportVersionUtils.getPreviousVersion(TransportVersions.PROJECT_STATE_REGISTRY_ENTRY);
+        TransportVersion oldVersion = TransportVersionUtils.getPreviousVersion(PROJECT_STATE_REGISTRY_ENTRY);
         ClusterState.Custom serialized = copyInstance(projectStateRegistry, oldVersion);
         assertThat(serialized, equalTo(projectStateRegistry));
     }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/TimeSeriesFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/TimeSeriesFeatureSetUsage.java
@@ -70,6 +70,7 @@
  * }
  */
 public class TimeSeriesFeatureSetUsage extends XPackFeatureUsage {
+
     private final long timeSeriesDataStreamCount;
     private final long timeSeriesIndexCount;
     private final DownsamplingUsage downsamplingUsage;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/grouping/Categorize.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/grouping/Categorize.java
@@ -7,7 +7,7 @@
 
 package org.elasticsearch.xpack.esql.expression.function.grouping;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -75,6 +75,7 @@ public class Categorize extends GroupingFunction.NonEvaluatableGroupingFunction
         "Categorize",
         Categorize::new
     );
+    private static final TransportVersion ESQL_CATEGORIZE_OPTIONS = TransportVersion.fromName("esql_categorize_options");
 
     private static final String ANALYZER = "analyzer";
     private static final String OUTPUT_FORMAT = "output_format";
@@ -148,17 +149,15 @@ private Categorize(StreamInput in) throws IOException {
         this(
             Source.readFrom((PlanStreamInput) in),
             in.readNamedWriteable(Expression.class),
-            in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CATEGORIZE_OPTIONS)
-                ? in.readOptionalNamedWriteable(Expression.class)
-                : null
+            in.getTransportVersion().supports(ESQL_CATEGORIZE_OPTIONS) ? in.readOptionalNamedWriteable(Expression.class) : null
         );
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         source().writeTo(out);
         out.writeNamedWriteable(field);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CATEGORIZE_OPTIONS)) {
+        if (out.getTransportVersion().supports(ESQL_CATEGORIZE_OPTIONS)) {
             out.writeOptionalNamedWriteable(options);
         }
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java
@@ -9,7 +9,7 @@
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesFailure;
 import org.elasticsearch.action.search.ShardSearchFailure;
@@ -104,6 +104,8 @@ public interface PlanRunner {
         void run(PhysicalPlan plan, ActionListener<Result> listener);
     }
 
+    private static final TransportVersion LOOKUP_JOIN_CCS = TransportVersion.fromName("lookup_join_ccs");
+
     private final String sessionId;
     private final Configuration configuration;
     private final IndexResolver indexResolver;
@@ -612,7 +614,7 @@ private void validateRemoteVersions(EsqlExecutionInfo executionInfo) {
             if (clusterAlias.equals(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY) == false) {
                 // No need to check local, obviously
                 var connection = remoteClusterService.getConnection(clusterAlias);
-                if (connection != null && connection.getTransportVersion().before(TransportVersions.LOOKUP_JOIN_CCS)) {
+                if (connection != null && connection.getTransportVersion().supports(LOOKUP_JOIN_CCS) == false) {
                     skipClusterOrError(
                         clusterAlias,
                         executionInfo,
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankServiceSettings.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.azureaistudio.rerank;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -27,6 +26,9 @@
 
 public class AzureAiStudioRerankServiceSettings extends AzureAiStudioServiceSettings {
     public static final String NAME = "azure_ai_studio_rerank_service_settings";
+    private static final TransportVersion ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED = TransportVersion.fromName(
+        "ml_inference_azure_ai_studio_rerank_added"
+    );
 
     public static AzureAiStudioRerankServiceSettings fromMap(Map<String, Object> map, ConfigurationParseContext context) {
         final var validationException = new ValidationException();
@@ -80,7 +82,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;
+        return ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankTaskSettings.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.azureaistudio.rerank;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,6 +31,9 @@
  */
 public class AzureAiStudioRerankTaskSettings implements TaskSettings {
     public static final String NAME = "azure_ai_studio_rerank_task_settings";
+    private static final TransportVersion ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED = TransportVersion.fromName(
+        "ml_inference_azure_ai_studio_rerank_added"
+    );
 
     public static AzureAiStudioRerankTaskSettings fromMap(Map<String, Object> map) {
         final var validationException = new ValidationException();
@@ -94,7 +96,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;
+        return ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/LlamaService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/LlamaService.java
@@ -9,7 +9,6 @@
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.ValidationException;
@@ -77,6 +76,7 @@
 public class LlamaService extends SenderService {
     public static final String NAME = "llama";
     private static final String SERVICE_NAME = "Llama";
+    private static final TransportVersion ML_INFERENCE_LLAMA_ADDED = TransportVersion.fromName("ml_inference_llama_added");
     /**
      * The optimal batch size depends on the hardware the model is deployed on.
      * For Llama use a conservatively small max batch size as it is
@@ -363,7 +363,7 @@ public Model parsePersistedConfig(String modelId, TaskType taskType, Map<String,
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_LLAMA_ADDED;
+        return ML_INFERENCE_LLAMA_ADDED;
     }
 
     /**
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/completion/LlamaChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/completion/LlamaChatCompletionServiceSettings.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.llama.completion;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -38,6 +37,7 @@
  */
 public class LlamaChatCompletionServiceSettings extends FilteredXContentObject implements ServiceSettings {
     public static final String NAME = "llama_completion_service_settings";
+    private static final TransportVersion ML_INFERENCE_LLAMA_ADDED = TransportVersion.fromName("ml_inference_llama_added");
     // There is no default rate limit for Llama, so we set a reasonable default of 3000 requests per minute
     protected static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(3000);
 
@@ -116,7 +116,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_LLAMA_ADDED;
+        return ML_INFERENCE_LLAMA_ADDED;
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/embeddings/LlamaEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/embeddings/LlamaEmbeddingsServiceSettings.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.llama.embeddings;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -45,6 +44,7 @@
  */
 public class LlamaEmbeddingsServiceSettings extends FilteredXContentObject implements ServiceSettings {
     public static final String NAME = "llama_embeddings_service_settings";
+    private static final TransportVersion ML_INFERENCE_LLAMA_ADDED = TransportVersion.fromName("ml_inference_llama_added");
     // There is no default rate limit for Llama, so we set a reasonable default of 3000 requests per minute
     protected static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(3000);
 
@@ -154,7 +154,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_LLAMA_ADDED;
+        return ML_INFERENCE_LLAMA_ADDED;
     }
 
     @Override
