Skip to content

Commit 6fe0bc1

Browse files
Updating cluster settings to generalized term
1 parent d8fc4af commit 6fe0bc1

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ public class InferencePlugin extends Plugin
180180
Setting.Property.NodeScope,
181181
Setting.Property.Dynamic
182182
);
183-
public static final TimeValue DEFAULT_SEMANTIC_TEXT_INFERENCE_TIMEOUT = TimeValue.timeValueSeconds(TimeUnit.SECONDS.toSeconds(10));
184-
public static final Setting<TimeValue> SEMANTIC_TEXT_INFERENCE_TIMEOUT = Setting.timeSetting(
183+
public static final TimeValue DEFAULT_QUERY_INFERENCE_TIMEOUT = TimeValue.timeValueSeconds(TimeUnit.SECONDS.toSeconds(10));
184+
public static final Setting<TimeValue> QUERY_INFERENCE_TIMEOUT = Setting.timeSetting(
185185
"xpack.inference.semantic_text.inference_timeout",
186-
DEFAULT_SEMANTIC_TEXT_INFERENCE_TIMEOUT,
186+
DEFAULT_QUERY_INFERENCE_TIMEOUT,
187187
Setting.Property.NodeScope,
188188
Setting.Property.Dynamic
189189
);
@@ -506,7 +506,7 @@ public List<Setting<?>> getSettings() {
506506
settings.add(SKIP_VALIDATE_AND_START);
507507
settings.add(INDICES_INFERENCE_BATCH_SIZE);
508508
settings.addAll(ElasticInferenceServiceSettings.getSettingsDefinitions());
509-
settings.add(SEMANTIC_TEXT_INFERENCE_TIMEOUT);
509+
settings.add(QUERY_INFERENCE_TIMEOUT);
510510
return settings;
511511
}
512512

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void infer(
7575
var chunkInferenceInput = input.stream().map(i -> new ChunkInferenceInput(i, null)).toList();
7676
var inferenceInput = createInput(this, model, chunkInferenceInput, inputType, query, returnDocuments, topN, stream);
7777
if (timeout == null) {
78-
timeout = serviceComponents.clusterService().getClusterSettings().get(InferencePlugin.SEMANTIC_TEXT_INFERENCE_TIMEOUT);
78+
timeout = serviceComponents.clusterService().getClusterSettings().get(InferencePlugin.QUERY_INFERENCE_TIMEOUT);
7979
}
8080
doInfer(model, inferenceInput, taskSettings, timeout, listener);
8181
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ private void preferredVariantFromPlatformArchitecture(ActionListener<PreferredMo
264264
}
265265

266266
protected TimeValue getConfiguredInferenceTimeout() {
267-
return clusterService.getClusterSettings().get(InferencePlugin.SEMANTIC_TEXT_INFERENCE_TIMEOUT);
267+
return clusterService.getClusterSettings().get(InferencePlugin.QUERY_INFERENCE_TIMEOUT);
268268
}
269269

270270
boolean isClusterInElasticCloud() {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/SageMakerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void infer(
152152
var inferenceRequest = new SageMakerInferenceRequest(query, returnDocuments, topN, input, stream, inputType);
153153

154154
if (timeout == null) {
155-
timeout = serviceComponents.clusterService().getClusterSettings().get(InferencePlugin.SEMANTIC_TEXT_INFERENCE_TIMEOUT);
155+
timeout = serviceComponents.clusterService().getClusterSettings().get(InferencePlugin.QUERY_INFERENCE_TIMEOUT);
156156
}
157157

158158
try {

0 commit comments

Comments
 (0)