Skip to content

Commit 2bad98d

Browse files
authored
Merge branch 'main' into enhancement/unmapped_fields_rewrite
2 parents d6440b4 + 6d5099e commit 2bad98d

File tree

33 files changed

+823
-84
lines changed

33 files changed

+823
-84
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
steps:
2+
- label: ":pipeline: Generate steps"
3+
command: bash .buildkite/scripts/generate-pr-performance-benchmark.sh | buildkite-agent pipeline upload

.buildkite/pipelines/pull-request/performance-benchmark.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.buildkite/pull-requests.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"set_commit_status": false,
2828
"build_on_commit": false,
2929
"build_on_comment": true,
30-
"trigger_comment_regex": "^(buildkite|@elastic(search)?machine) benchmark this with (?<benchmark>\\w+)( please)?$"
30+
"target_branch": "main",
31+
"trigger_comment_regex": "^(buildkite|@elastic(search)?machine) benchmark this with (?<benchmark>\\S+)( please)?$"
3132
}
3233
]
3334
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
env_id_baseline=$(python3 -c 'import uuid; print(uuid.uuid4())')
6+
env_id_contender=$(python3 -c 'import uuid; print(uuid.uuid4())')
7+
merge_base=$(git merge-base "${GITHUB_PR_TARGET_BRANCH}" HEAD)
8+
9+
buildkite-agent meta-data set pr_comment:custom-body:body \
10+
"This build attempted two ${GITHUB_PR_COMMENT_VAR_BENCHMARK} benchmarks to evaluate performance impact of this PR."
11+
buildkite-agent meta-data set pr_comment:custom-baseline:head \
12+
"* Baseline: ${merge_base} (env ID ${env_id_baseline})"
13+
buildkite-agent meta-data set pr_comment:custom-contender:head \
14+
"* Contender: ${GITHUB_PR_TRIGGERED_SHA} (env ID ${env_id_contender})"
15+
16+
cat << _EOF_
17+
steps:
18+
- label: Trigger baseline benchmark
19+
trigger: elasticsearch-performance-esbench-pr
20+
build:
21+
message: Baseline benchmark for PR${GITHUB_PR_NUMBER}
22+
branch: master
23+
env:
24+
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
25+
ENV_ID: ${env_id_baseline}
26+
REVISION: ${merge_base}
27+
- label: Trigger contender benchmark
28+
trigger: elasticsearch-performance-esbench-pr
29+
build:
30+
message: Contender benchmark for PR${GITHUB_PR_NUMBER}
31+
branch: master
32+
env:
33+
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
34+
ENV_ID: ${env_id_contender}
35+
ES_REPO_URL: https://github.com/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}.git
36+
REVISION: ${GITHUB_PR_TRIGGERED_SHA}
37+
- wait: ~
38+
- label: Modify PR comment
39+
command: buildkite-agent meta-data set pr_comment:custom-comparison:head "* [Benchmark results](<https://esbench-metrics.kb.us-east-2.aws.elastic-cloud.com:9243/app/dashboards#/view/d9079962-5866-49ef-b9f5-145f2141cd31?_a=(query:(language:kuery,query:'user-tags.env-id:${env_id_baseline} or user-tags.env-id:${env_id_contender}'))>)"
40+
_EOF_

catalog-info.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ spec:
323323
name: elasticsearch / pull-request / performance-benchmark
324324
spec:
325325
repository: elastic/elasticsearch
326-
pipeline_file: .buildkite/pipelines/pull-request/performance-benchmark.yml
326+
pipeline_file: .buildkite/pipelines/pull-request-performance-benchmark.yml
327327
env:
328328
ELASTIC_PR_COMMENTS_ENABLED: "true"
329329
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"

docs/changelog/130325.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
pr: 130325
2+
summary: "Simulate API: Return 400 on invalid processor(s)"
3+
area: Ingest Node
4+
type: bug
5+
issues:
6+
- 120731
7+
breaking:
8+
title: Return 400 on invalid processor(s) in Simulate API
9+
area: Ingest
10+
details: "In earlier versions of {es}, the Simulate API would return a 500 error\
11+
\ when encountering invalid processors. Now, it returns a 400 Bad Request error\
12+
\ instead."
13+
impact: Callers should expect a 400 Bad Request response when the Simulate API encounters
14+
invalid processors. This change improves error handling and provides clearer feedback
15+
on request issues.
16+
notable: false

docs/changelog/74274.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 74274
2+
summary: Introduce new rescorer based on script
3+
area: Search
4+
type: feature
5+
issues:
6+
- 52338

modules/ingest-common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828

2929
restResources {
3030
restApi {
31-
include '_common', 'ingest', 'cluster', 'indices', 'index', 'bulk', 'nodes', 'get', 'update', 'cat', 'mget', 'search'
31+
include '_common', 'ingest', 'cluster', 'indices', 'index', 'bulk', 'nodes', 'get', 'update', 'cat', 'mget', 'search', 'simulate'
3232
}
3333
}
3434

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/120_grok.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,48 @@ teardown:
154154
ingest.processor_grok: {}
155155
- length: { patterns: 318 }
156156
- match: { patterns.PATH: "(?:%{UNIXPATH}|%{WINPATH})" }
157+
158+
159+
---
160+
"Test simulate with invalid GROK pattern":
161+
- requires:
162+
cluster_features: [ "simulate.ingest.400_on_failure" ]
163+
reason: "simulate.ingest returned 500 on failure before"
164+
- skip:
165+
features: headers
166+
- do:
167+
catch: bad_request
168+
headers:
169+
Content-Type: application/json
170+
simulate.ingest:
171+
pipeline: "invalid-grok"
172+
body: >
173+
{
174+
"docs": [
175+
{
176+
"_index": "index-1",
177+
"_source": {
178+
"foo": "bar"
179+
}
180+
}
181+
],
182+
"pipeline_substitutions": {
183+
"invalid-grok": {
184+
"description": "invalid grok pattern",
185+
"processors": [
186+
{
187+
"grok": {
188+
"field": "field",
189+
"patterns": [
190+
"%{INVALID_PATTERN:field}"
191+
]
192+
}
193+
}
194+
]
195+
}
196+
}
197+
}
198+
- match: { status: 400 }
199+
- match: { error.reason: "[patterns] Invalid regex pattern found in: [%{INVALID_PATTERN:field}]. Unable to find pattern [INVALID_PATTERN] in Grok's pattern dictionary" }
200+
- match: { error.property_name: "patterns" }
201+
- match: { error.processor_type: "grok" }

muted-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,6 @@ tests:
299299
- class: org.elasticsearch.compute.operator.LimitOperatorTests
300300
method: testEarlyTermination
301301
issue: https://github.com/elastic/elasticsearch/issues/128721
302-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
303-
method: test {csv-spec:lookup-join.EnrichLookupStatsBug}
304-
issue: https://github.com/elastic/elasticsearch/issues/129228
305-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
306-
method: test {lookup-join.MultipleBatches*
307-
issue: https://github.com/elastic/elasticsearch/issues/129210
308302
- class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests
309303
method: testWindowsMixedCaseAccess
310304
issue: https://github.com/elastic/elasticsearch/issues/129167
@@ -471,9 +465,6 @@ tests:
471465
- class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
472466
method: testRevertModelSnapshot
473467
issue: https://github.com/elastic/elasticsearch/issues/132733
474-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
475-
method: test {csv-spec:lookup-join.MvJoinKeyFromRowExpanded}
476-
issue: https://github.com/elastic/elasticsearch/issues/132778
477468
- class: org.elasticsearch.gradle.internal.transport.TransportVersionManagementPluginFuncTest
478469
method: definitions have primary ids which cannot change
479470
issue: https://github.com/elastic/elasticsearch/issues/132788
@@ -615,6 +606,15 @@ tests:
615606
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
616607
method: test {p0=search.vectors/100_knn_nested_search/nested kNN search inner_hits & profiling}
617608
issue: https://github.com/elastic/elasticsearch/issues/133273
609+
- class: org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapperTests
610+
method: testDefaultIndexOptions {p0=true}
611+
issue: https://github.com/elastic/elasticsearch/issues/133326
612+
- class: org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapperTests
613+
method: testDefaultIndexOptions {p0=false}
614+
issue: https://github.com/elastic/elasticsearch/issues/133327
615+
- class: org.elasticsearch.xpack.security.authc.AuthenticationServiceTests
616+
method: testInvalidToken
617+
issue: https://github.com/elastic/elasticsearch/issues/133328
618618

619619
# Examples:
620620
#

0 commit comments

Comments
 (0)