Skip to content

Commit 315375e

Browse files
Jan-Kazlouski-elasticJan-Kazlouski-elastic
committed
Merge remote-tracking branch 'origin/main' into llama-refactoring
2 parents e7e4593 + 63258f4 commit 315375e

File tree

28 files changed

+775
-253
lines changed

28 files changed

+775
-253
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
68+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,22 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.5
336336

337+
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
339+
timeout_in_minutes: 300
340+
matrix:
341+
setup:
342+
image:
343+
- rocky-8
344+
- ubuntu-2404
345+
agents:
346+
provider: gcp
347+
image: family/elasticsearch-{{matrix.image}}
348+
machineType: custom-16-32768
349+
buildDirectory: /dev/shm/bk
350+
env:
351+
BWC_VERSION: 8.19.0
352+
337353
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
338354
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
339355
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,25 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366+
- label: 8.19.0 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
368+
timeout_in_minutes: 300
369+
agents:
370+
provider: gcp
371+
image: family/elasticsearch-ubuntu-2404
372+
machineType: n1-standard-32
373+
buildDirectory: /dev/shm/bk
374+
preemptible: true
375+
env:
376+
BWC_VERSION: 8.19.0
377+
retry:
378+
automatic:
379+
- exit_status: "-1"
380+
limit: 3
381+
signal_reason: none
382+
- signal_reason: agent_stop
383+
limit: 3
384+
366385
- label: 9.0.5 / bwc
367386
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#bwcTest
368387
timeout_in_minutes: 300
@@ -487,7 +506,7 @@ steps:
487506
setup:
488507
ES_RUNTIME_JAVA:
489508
- openjdk21
490-
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
509+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
491510
agents:
492511
provider: gcp
493512
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +550,7 @@ steps:
531550
ES_RUNTIME_JAVA:
532551
- openjdk21
533552
- openjdk23
534-
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
553+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
535554
agents:
536555
provider: gcp
537556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.5"
21+
- "8.19.0"
2122
- "9.0.5"
2223
- "9.1.1"
2324
- "9.2.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
BWC_VERSION:
22
- "8.17.10"
33
- "8.18.5"
4+
- "8.19.0"
45
- "9.0.5"
56
- "9.1.1"
67
- "9.2.0"

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:69f3df4cc5fd08b194a1a44dda2ff9f6665ac2b59063a2b2aedb8948ebd87f97 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:ea864ffab2b828ec157b2480c8b8dbd6f27da682c59a93d4b75a46163922b237 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:69f3df4cc5fd08b194a1a44dda2ff9f6665ac2b59063a2b2aedb8948ebd87f97
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:ea864ffab2b828ec157b2480c8b8dbd6f27da682c59a93d4b75a46163922b237
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c4caa90ee9cf26c9143e44074f50ba9bb17636823bde4397751a5e0d846bfd6 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:9ded4d2364e7f263cada56b0b9ca3ef643e8dac958a79df3d18c2a9f0a33fbc7 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c4caa90ee9cf26c9143e44074f50ba9bb17636823bde4397751a5e0d846bfd6
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:9ded4d2364e7f263cada56b0b9ca3ef643e8dac958a79df3d18c2a9f0a33fbc7
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/reference/query-languages/esql/_snippets/commands/layout/completion.md‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,39 @@ including:
4646
**Requirements**
4747

4848
To use this command, you must deploy your LLM model in Elasticsearch as
49-
an [≈inference endpoint](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put) with the
49+
an [inference endpoint](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put) with the
5050
task type `completion`.
5151

52+
#### Handling timeouts
53+
54+
`COMPLETION` commands may time out when processing large datasets or complex prompts. The default timeout is 10 minutes, but you can increase this limit if necessary.
55+
56+
How you increase the timeout depends on your deployment type:
57+
58+
::::{tab-set}
59+
:::{tab-item} {{ech}}
60+
* You can adjust {{es}} settings in the [Elastic Cloud Console](docs-content://deploy-manage/deploy/elastic-cloud/edit-stack-settings.md)
61+
* You can also adjust the `search.default_search_timeout` cluster setting using [Kibana's Advanced settings](kibana://reference/advanced-settings.md#kibana-search-settings)
62+
:::
63+
64+
:::{tab-item} Self-managed
65+
* You can configure at the cluster level by setting `search.default_search_timeout` in `elasticsearch.yml` or updating via [Cluster Settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings)
66+
* You can also adjust the `search:timeout` setting using [Kibana's Advanced settings](kibana://reference/advanced-settings.md#kibana-search-settings)
67+
* Alternatively, you can add timeout parameters to individual queries
68+
:::
69+
70+
:::{tab-item} {{serverless-full}}
71+
* Requires a manual override from Elastic Support because you cannot modify timeout settings directly
72+
:::
73+
::::
74+
75+
If you don't want to increase the timeout limit, try the following:
76+
77+
* Reduce data volume with `LIMIT` or more selective filters before the `COMPLETION` command
78+
* Split complex operations into multiple simpler queries
79+
* Configure your HTTP client's response timeout (Refer to [HTTP client configuration](/reference/elasticsearch/configuration-reference/networking-settings.md#_http_client_configuration))
80+
81+
5282
**Examples**
5383

5484
Use the default column name (results stored in `completion` column):

‎muted-tests.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,75 @@ tests:
545545
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
546546
method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=int8_hnsw}
547547
issue: https://github.com/elastic/elasticsearch/issues/132117
548+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
549+
method: testDenseVectorMappingUpdate {initialType=flat updateType=hnsw}
550+
issue: https://github.com/elastic/elasticsearch/issues/132119
551+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
552+
method: testDenseVectorMappingUpdate {initialType=flat updateType=bbq_flat}
553+
issue: https://github.com/elastic/elasticsearch/issues/132120
554+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
555+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=bbq_disk}
556+
issue: https://github.com/elastic/elasticsearch/issues/132122
557+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
558+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=int4_hnsw}
559+
issue: https://github.com/elastic/elasticsearch/issues/132123
560+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
561+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=hnsw}
562+
issue: https://github.com/elastic/elasticsearch/issues/132124
563+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
564+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=int4_flat}
565+
issue: https://github.com/elastic/elasticsearch/issues/132125
566+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
567+
method: testDenseVectorMappingUpdate {initialType=flat updateType=int8_hnsw}
568+
issue: https://github.com/elastic/elasticsearch/issues/132126
569+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
570+
method: testDenseVectorMappingUpdate {initialType=bbq_disk updateType=bbq_disk}
571+
issue: https://github.com/elastic/elasticsearch/issues/132127
572+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
573+
method: testDenseVectorMappingUpdate {initialType=flat updateType=int8_flat}
574+
issue: https://github.com/elastic/elasticsearch/issues/132129
575+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
576+
method: "testDenseVectorMappingUpdate {initialType=flat updateType=bbq_disk #2}"
577+
issue: https://github.com/elastic/elasticsearch/issues/132130
578+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
579+
method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=bbq_flat}
580+
issue: https://github.com/elastic/elasticsearch/issues/132132
581+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
582+
method: testDenseVectorMappingUpdate {initialType=int8_hnsw updateType=int4_hnsw}
583+
issue: https://github.com/elastic/elasticsearch/issues/132133
584+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
585+
method: testDenseVectorMappingUpdate {initialType=bbq_flat updateType=bbq_disk}
586+
issue: https://github.com/elastic/elasticsearch/issues/132134
587+
- class: org.elasticsearch.upgrades.RunningSnapshotIT
588+
method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=1}
589+
issue: https://github.com/elastic/elasticsearch/issues/132135
590+
- class: org.elasticsearch.upgrades.RunningSnapshotIT
591+
method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=2}
592+
issue: https://github.com/elastic/elasticsearch/issues/132136
593+
- class: org.elasticsearch.upgrades.RunningSnapshotIT
594+
method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=3}
595+
issue: https://github.com/elastic/elasticsearch/issues/132137
596+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
597+
method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=int4_hnsw}
598+
issue: https://github.com/elastic/elasticsearch/issues/132140
599+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
600+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=bbq_hnsw}
601+
issue: https://github.com/elastic/elasticsearch/issues/132141
602+
- class: org.elasticsearch.index.engine.MergeWithLowDiskSpaceIT
603+
method: testRelocationWhileForceMerging
604+
issue: https://github.com/elastic/elasticsearch/issues/131789
605+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
606+
method: testDenseVectorMappingUpdate {initialType=flat updateType=int4_hnsw}
607+
issue: https://github.com/elastic/elasticsearch/issues/132149
608+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
609+
method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=hnsw}
610+
issue: https://github.com/elastic/elasticsearch/issues/132150
611+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
612+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=bbq_flat}
613+
issue: https://github.com/elastic/elasticsearch/issues/132151
614+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
615+
method: "testDenseVectorMappingUpdate {initialType=bbq_hnsw updateType=bbq_disk #2}"
616+
issue: https://github.com/elastic/elasticsearch/issues/132152
548617

549618
# Examples:
550619
#

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ static TransportVersion def(int id) {
333333
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
334334
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
335335
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03);
336-
// Below is the first version in 9.2 and NOT in 9.1.
337336
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_1 = def(9_112_0_04);
338337
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
339338
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);

0 commit comments

Comments
 (0)