Skip to content

Commit 42d5eab

Browse files
committed
Fix test errors
1 parent 33d1be1 commit 42d5eab

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/SemanticCrossClusterSearchIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void testSemanticCrossClusterSearch() throws Exception {
9595

9696
SearchRequest searchRequest = new SearchRequest(localIndex, REMOTE_CLUSTER + ":" + remoteIndex);
9797
searchRequest.source(new SearchSourceBuilder().query(new SemanticQueryBuilder(INFERENCE_FIELD, "foo")).size(10));
98-
searchRequest.setCcsMinimizeRoundtrips(false);
98+
searchRequest.setCcsMinimizeRoundtrips(true);
9999

100100
assertResponse(client(LOCAL_CLUSTER).search(searchRequest), response -> {
101101
assertNotNull(response);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.elasticsearch.inference.EmptyTaskSettings;
1414
import org.elasticsearch.inference.InferenceResults;
1515
import org.elasticsearch.inference.InferenceServiceResults;
16+
import org.elasticsearch.inference.MinimalServiceSettings;
1617
import org.elasticsearch.inference.SecretSettings;
1718
import org.elasticsearch.inference.ServiceSettings;
1819
import org.elasticsearch.inference.TaskSettings;
@@ -185,6 +186,9 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
185186
namedWriteables.addAll(DeepSeekChatCompletionModel.namedWriteables());
186187
namedWriteables.addAll(SageMakerModel.namedWriteables());
187188
namedWriteables.addAll(SageMakerSchemas.namedWriteables());
189+
namedWriteables.add(
190+
new NamedWriteableRegistry.Entry(MinimalServiceSettings.class, MinimalServiceSettings.NAME, MinimalServiceSettings::new)
191+
);
188192

189193
return namedWriteables;
190194
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/MapEmbeddingsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public String getWriteableName() {
3636

3737
@Override
3838
public void writeTo(StreamOutput out) throws IOException {
39-
out.writeMap(embeddings);
39+
out.writeMap(embeddings, StreamOutput::writeWriteable, StreamOutput::writeNamedWriteable);
4040
}
4141

4242
@Override

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/LocalStateInferencePlugin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,9 @@ public Map<String, Highlighter> getHighlighters() {
7373
public Collection<MappedActionFilter> getMappedActionFilters() {
7474
return inferencePlugin.getMappedActionFilters();
7575
}
76+
77+
@Override
78+
public void onNodeStarted() {
79+
inferencePlugin.onNodeStarted();
80+
}
7681
}

0 commit comments

Comments
 (0)