From 1535859bcb2a03b0c3711daadf20988ed663714c Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Wed, 1 Oct 2025 12:37:44 -0700 Subject: [PATCH 1/2] Migrate transport versions 8841_032 and 8841_031. (#135789) ES-12334 --- .../src/main/java/org/elasticsearch/TransportVersions.java | 2 -- .../action/fieldcaps/FieldCapabilitiesRequest.java | 7 +++++-- .../definitions/referable/field_caps_add_cluster_alias.csv | 1 + .../ml_inference_hugging_face_chat_completion_added.csv | 1 + .../HuggingFaceChatCompletionServiceSettings.java | 7 +++++-- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 server/src/main/resources/transport/definitions/referable/field_caps_add_cluster_alias.csv create mode 100644 server/src/main/resources/transport/definitions/referable/ml_inference_hugging_face_chat_completion_added.csv diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index f9cf4bab85ecd..ce2fb0b9deea1 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -211,8 +211,6 @@ static TransportVersion def(int id) { public static final TransportVersion INFERENCE_ADD_TIMEOUT_PUT_ENDPOINT_8_19 = def(8_841_0_28); public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING_8_19 = def(8_841_0_29); public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_8_19 = def(8_841_0_30); - public static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_31); - public static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = def(8_841_0_32); /* * STOP! READ THIS FIRST! No, really, diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java index 5d4f6c5f0cc53..d6baa546094d8 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java @@ -9,6 +9,7 @@ package org.elasticsearch.action.fieldcaps; +import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -38,6 +39,8 @@ public final class FieldCapabilitiesRequest extends LegacyActionRequest implemen public static final String NAME = "field_caps_request"; public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpenAndForbidClosed(); + private static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = TransportVersion.fromName("field_caps_add_cluster_alias"); + private String clusterAlias = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY; private String[] indices = Strings.EMPTY_ARRAY; @@ -70,7 +73,7 @@ public FieldCapabilitiesRequest(StreamInput in) throws IOException { if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { includeEmptyFields = in.readBoolean(); } - if (in.getTransportVersion().onOrAfter(TransportVersions.FIELD_CAPS_ADD_CLUSTER_ALIAS)) { + if (in.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) { clusterAlias = in.readOptionalString(); } else { clusterAlias = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY; @@ -124,7 +127,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { out.writeBoolean(includeEmptyFields); } - if (out.getTransportVersion().onOrAfter(TransportVersions.FIELD_CAPS_ADD_CLUSTER_ALIAS)) { + if (out.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) { out.writeOptionalString(clusterAlias); } } diff --git a/server/src/main/resources/transport/definitions/referable/field_caps_add_cluster_alias.csv b/server/src/main/resources/transport/definitions/referable/field_caps_add_cluster_alias.csv new file mode 100644 index 0000000000000..f297cc6fd9310 --- /dev/null +++ b/server/src/main/resources/transport/definitions/referable/field_caps_add_cluster_alias.csv @@ -0,0 +1 @@ + 9073000,8841032 diff --git a/server/src/main/resources/transport/definitions/referable/ml_inference_hugging_face_chat_completion_added.csv b/server/src/main/resources/transport/definitions/referable/ml_inference_hugging_face_chat_completion_added.csv new file mode 100644 index 0000000000000..c8efcf7120947 --- /dev/null +++ b/server/src/main/resources/transport/definitions/referable/ml_inference_hugging_face_chat_completion_added.csv @@ -0,0 +1 @@ + 9078000,8841031 diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java index 039b7f39cbf75..1860e2a0ae8fb 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference.services.huggingface.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; @@ -50,6 +49,10 @@ public class HuggingFaceChatCompletionServiceSettings extends FilteredXContentOb // 3000 requests per minute private static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(3000); + private static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED = TransportVersion.fromName( + "ml_inference_hugging_face_chat_completion_added" + ); + /** * Creates a new instance of {@link HuggingFaceChatCompletionServiceSettings} from a map of settings. * @param map the map of settings @@ -144,7 +147,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19; + return ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED; } @Override From 5b4ed319062913e71ae8c1335bf8bf041f81160f Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Wed, 1 Oct 2025 13:33:36 -0700 Subject: [PATCH 2/2] fix test --- .../src/test/java/org/elasticsearch/TransportVersionTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index ae4368e344e74..e31732f872256 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -467,7 +467,7 @@ public void testTransportVersionsLocked() { "TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName " + "and generateTransportVersion gradle task", versions.get(versions.size() - 1).id(), - equalTo(8_841_0_32) + equalTo(8_841_0_30) ); } }