From 9bc1966367ff2a8e1c43731aa8a8c7f158ab1b35 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 12 Dec 2024 17:12:24 +0100 Subject: [PATCH 1/4] bump timeout in SQB to 30s --- .../xpack/inference/queries/SemanticQueryBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java index d648db2fbfdbc..6ba4e6f1f54f0 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java @@ -16,6 +16,7 @@ import org.elasticsearch.cluster.metadata.InferenceFieldMetadata; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; +import org.elasticsearch.core.TimeValue; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.query.AbstractQueryBuilder; @@ -32,7 +33,6 @@ import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentParser; import org.elasticsearch.xpack.core.inference.action.InferenceAction; -import org.elasticsearch.xpack.core.ml.action.InferModelAction; import org.elasticsearch.xpack.core.ml.inference.results.ErrorInferenceResults; import org.elasticsearch.xpack.core.ml.inference.results.MlTextEmbeddingResults; import org.elasticsearch.xpack.core.ml.inference.results.TextExpansionResults; @@ -63,6 +63,7 @@ public class SemanticQueryBuilder extends AbstractQueryBuilder new SemanticQueryBuilder((String) args[0], (String) args[1]) ); + private static final TimeValue DEFAULT_TIMEOUT = TimeValue.timeValueSeconds(30); static { PARSER.declareString(constructorArg(), FIELD_FIELD); @@ -208,7 +209,7 @@ private SemanticQueryBuilder doRewriteGetInferenceResults(QueryRewriteContext qu List.of(query), Map.of(), InputType.SEARCH, - InferModelAction.Request.DEFAULT_TIMEOUT_FOR_API, + DEFAULT_TIMEOUT, false ); From f40c0014d15dd037bf96ebdf5f2574d5a6373c7a Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 12 Dec 2024 17:14:41 +0100 Subject: [PATCH 2/4] Update docs/changelog/118586.yaml --- docs/changelog/118586.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/118586.yaml diff --git a/docs/changelog/118586.yaml b/docs/changelog/118586.yaml new file mode 100644 index 0000000000000..ea01efba68f98 --- /dev/null +++ b/docs/changelog/118586.yaml @@ -0,0 +1,5 @@ +pr: 118586 +summary: Bump timeout in `SemanticQueryBuilder` to 30s +area: Search +type: enhancement +issues: [] From de72ce717765b3f0c3b107c294f5ad33a2d25a5d Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Fri, 13 Dec 2024 14:40:28 +0100 Subject: [PATCH 3/4] use InferenceAction default timeout --- .../xpack/inference/queries/SemanticQueryBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java index 169142d5fbd8e..ffd011d98befc 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java @@ -65,7 +65,6 @@ public class SemanticQueryBuilder extends AbstractQueryBuilder new SemanticQueryBuilder((String) args[0], (String) args[1], (Boolean) args[2]) ); - private static final TimeValue DEFAULT_TIMEOUT = TimeValue.timeValueSeconds(30); static { PARSER.declareString(constructorArg(), FIELD_FIELD); @@ -232,7 +231,7 @@ private SemanticQueryBuilder doRewriteGetInferenceResults(QueryRewriteContext qu List.of(query), Map.of(), InputType.SEARCH, - DEFAULT_TIMEOUT, + InferenceAction.Request.DEFAULT_TIMEOUT, false ); From 2e7f472ae9369d422e40db836c9cc6dba274eacf Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Fri, 13 Dec 2024 14:52:34 +0100 Subject: [PATCH 4/4] unused import removed --- .../xpack/inference/queries/SemanticQueryBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java index ffd011d98befc..eb7b365eb99ac 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java @@ -16,7 +16,6 @@ import org.elasticsearch.cluster.metadata.InferenceFieldMetadata; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.core.TimeValue; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.query.AbstractQueryBuilder;