Migrate transport version 9157_000 (elastic#134678)

Author: jdconrad

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

@@ -321,7 +321,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = def(9_109_00_0);
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
     public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
-    public static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = def(9_157_0_00);
     public static final TransportVersion INDEX_SOURCE = def(9_158_0_00);
     public static final TransportVersion MAX_HEAP_SIZE_PER_NODE_IN_CLUSTER_INFO = def(9_159_0_00);
     public static final TransportVersion TIMESERIES_DEFAULT_LIMIT = def(9_160_0_00);

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

@@ -0,0 +1 @@
+9157000

server/src/main/resources/transport/upper_bounds/9.2.csv

@@ -1 +1 @@
-inference_api_eis_diagnostics,9156000
+ml_inference_endpoint_cache,9157000

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceDiagnosticsAction.java

@@ -29,12 +29,12 @@
 import java.util.List;
 import java.util.Objects;
 
-import static org.elasticsearch.TransportVersions.ML_INFERENCE_ENDPOINT_CACHE;
-
 public class GetInferenceDiagnosticsAction extends ActionType<GetInferenceDiagnosticsAction.Response> {
 
     public static final GetInferenceDiagnosticsAction INSTANCE = new GetInferenceDiagnosticsAction();
     public static final String NAME = "cluster:monitor/xpack/inference/diagnostics/get";
+
+    private static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = TransportVersion.fromName("ml_inference_endpoint_cache");
     private static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = TransportVersion.fromName("inference_api_eis_diagnostics");
 
     public GetInferenceDiagnosticsAction() {
@@ -151,7 +151,7 @@ public NodeResponse(StreamInput in) throws IOException {
             } else {
                 eisMtlsConnectionPoolStats = ConnectionPoolStats.EMPTY;
             }
-            inferenceEndpointRegistryStats = in.getTransportVersion().onOrAfter(ML_INFERENCE_ENDPOINT_CACHE)
+            inferenceEndpointRegistryStats = in.getTransportVersion().supports(ML_INFERENCE_ENDPOINT_CACHE)
                 ? in.readOptionalWriteable(Stats::new)
                 : null;
         }
@@ -164,7 +164,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().supports(INFERENCE_API_EIS_DIAGNOSTICS)) {
                 eisMtlsConnectionPoolStats.writeTo(out);
             }
-            if (out.getTransportVersion().onOrAfter(ML_INFERENCE_ENDPOINT_CACHE)) {
+            if (out.getTransportVersion().supports(ML_INFERENCE_ENDPOINT_CACHE)) {
                 out.writeOptionalWriteable(inferenceEndpointRegistryStats);
             }
         }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/GetInferenceDiagnosticsActionNodeResponseTests.java

@@ -9,7 +9,6 @@
 
 import org.apache.http.pool.PoolStats;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
 import org.elasticsearch.common.Strings;
@@ -22,6 +21,7 @@
 public class GetInferenceDiagnosticsActionNodeResponseTests extends AbstractBWCWireSerializationTestCase<
     GetInferenceDiagnosticsAction.NodeResponse> {
 
+    private static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = TransportVersion.fromName("ml_inference_endpoint_cache");
     private static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = TransportVersion.fromName("inference_api_eis_diagnostics");
 
     public static GetInferenceDiagnosticsAction.NodeResponse createRandom() {
@@ -108,7 +108,7 @@ public static GetInferenceDiagnosticsAction.NodeResponse mutateNodeResponseForVe
         GetInferenceDiagnosticsAction.NodeResponse instance,
         TransportVersion version
     ) {
-        if (version.onOrAfter(TransportVersions.ML_INFERENCE_ENDPOINT_CACHE)) {
+        if (version.supports(ML_INFERENCE_ENDPOINT_CACHE)) {
             return instance;
         }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java

@@ -50,8 +50,6 @@
 import java.util.Iterator;
 import java.util.Objects;
 
-import static org.elasticsearch.TransportVersions.ML_INFERENCE_ENDPOINT_CACHE;
-
 /**
  * Clears the cache in {@link InferenceEndpointRegistry}.
  * This uses the cluster state to broadcast the message to all nodes to clear their cache, which has guaranteed delivery.
@@ -66,6 +64,8 @@ public class ClearInferenceEndpointCacheAction extends AcknowledgedTransportMast
     public static final ActionType<AcknowledgedResponse> INSTANCE = new ActionType<>(NAME);
     private static final String TASK_QUEUE_NAME = "inference-endpoint-cache-management";
 
+    private static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = TransportVersion.fromName("ml_inference_endpoint_cache");
+
     private final ProjectResolver projectResolver;
     private final InferenceEndpointRegistry inferenceEndpointRegistry;
     private final MasterServiceTaskQueue<RefreshCacheMetadataVersionTask> taskQueue;