Skip to content

Commit fc6d4c0

Browse files
authored
[8.19] Migrate transport versions 8841_032 and 8841_031. (#135789) (#135802)
* Migrate transport versions 8841_032 and 8841_031. (#135789) ES-12334 * fix test
1 parent 2ebecd8 commit fc6d4c0

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ static TransportVersion def(int id) {
211211
public static final TransportVersion INFERENCE_ADD_TIMEOUT_PUT_ENDPOINT_8_19 = def(8_841_0_28);
212212
public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING_8_19 = def(8_841_0_29);
213213
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_8_19 = def(8_841_0_30);
214-
public static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_31);
215-
public static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = def(8_841_0_32);
216214

217215
/*
218216
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
package org.elasticsearch.action.fieldcaps;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.ActionRequestValidationException;
1415
import org.elasticsearch.action.IndicesRequest;
@@ -38,6 +39,8 @@ public final class FieldCapabilitiesRequest extends LegacyActionRequest implemen
3839
public static final String NAME = "field_caps_request";
3940
public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpenAndForbidClosed();
4041

42+
private static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = TransportVersion.fromName("field_caps_add_cluster_alias");
43+
4144
private String clusterAlias = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY;
4245

4346
private String[] indices = Strings.EMPTY_ARRAY;
@@ -70,7 +73,7 @@ public FieldCapabilitiesRequest(StreamInput in) throws IOException {
7073
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
7174
includeEmptyFields = in.readBoolean();
7275
}
73-
if (in.getTransportVersion().onOrAfter(TransportVersions.FIELD_CAPS_ADD_CLUSTER_ALIAS)) {
76+
if (in.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) {
7477
clusterAlias = in.readOptionalString();
7578
} else {
7679
clusterAlias = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY;
@@ -124,7 +127,7 @@ public void writeTo(StreamOutput out) throws IOException {
124127
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
125128
out.writeBoolean(includeEmptyFields);
126129
}
127-
if (out.getTransportVersion().onOrAfter(TransportVersions.FIELD_CAPS_ADD_CLUSTER_ALIAS)) {
130+
if (out.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) {
128131
out.writeOptionalString(clusterAlias);
129132
}
130133
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9073000,8841032
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9078000,8841031

server/src/test/java/org/elasticsearch/TransportVersionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public void testTransportVersionsLocked() {
467467
"TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName "
468468
+ "and generateTransportVersion gradle task",
469469
versions.get(versions.size() - 1).id(),
470-
equalTo(8_841_0_32)
470+
equalTo(8_841_0_30)
471471
);
472472
}
473473
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference.services.huggingface.completion;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.common.ValidationException;
1312
import org.elasticsearch.common.io.stream.StreamInput;
1413
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -50,6 +49,10 @@ public class HuggingFaceChatCompletionServiceSettings extends FilteredXContentOb
5049
// 3000 requests per minute
5150
private static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(3000);
5251

52+
private static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED = TransportVersion.fromName(
53+
"ml_inference_hugging_face_chat_completion_added"
54+
);
55+
5356
/**
5457
* Creates a new instance of {@link HuggingFaceChatCompletionServiceSettings} from a map of settings.
5558
* @param map the map of settings
@@ -144,7 +147,7 @@ public String getWriteableName() {
144147

145148
@Override
146149
public TransportVersion getMinimalSupportedVersion() {
147-
return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19;
150+
return ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED;
148151
}
149152

150153
@Override

0 commit comments

Comments
 (0)