Skip to content

[8.19] Migrate transport versions 8841_032 and 8841_031. (#135789) #135802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2025
Merged

[8.19] Migrate transport versions 8841_032 and 8841_031. (#135789) #135802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1535859
Migrate transport versions 8841_032 and 8841_031. (#135789)
jdconrad Oct 1, 2025
5b4ed31
fix test
jdconrad Oct 1, 2025
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
2 changes: 0 additions & 2 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand Down
1 change: 1 addition & 0 deletions server/src/main/resources/transport/definitions/referable/field_caps_add_cluster_alias.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9073000,8841032
1 change: 1 addition & 0 deletions ...urces/transport/definitions/referable/ml_inference_hugging_face_chat_completion_added.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9078000,8841031
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/TransportVersionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
}
7 changes: 5 additions & 2 deletions ...k/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down