Skip to content

Commit 849135f

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents f23c539 + d008ada commit 849135f

File tree

119 files changed

+2267
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+2267
-1550
lines changed

build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ develocity {
9898
link 'Source', "${prBaseUrl}/tree/${System.getenv('BUILDKITE_COMMIT')}"
9999
link 'Pull Request', "https://github.com/${repository}/pull/${prId}"
100100
} else {
101-
value 'Git Commit ID', gitRevision.get()
102-
link 'Source', "https://github.com/${repository}/tree/${gitRevision.get()}"
101+
value 'Git Commit ID', gitRevision
102+
link 'Source', "https://github.com/${repository}/tree/${gitRevision}"
103103
}
104104

105105
buildFinished { result ->

build-tools-internal/version.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
2020
awsv1sdk = 1.12.270
2121
awsv2sdk = 2.28.13
22+
reactive_streams = 1.0.4
2223

2324
antlr4 = 4.13.1
2425
# bouncy castle version for non-fips. fips jars use a different version

build.gradle

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -221,25 +221,11 @@ tasks.register("verifyVersions") {
221221
}
222222
}
223223

224-
/*
225-
* When adding backcompat behavior that spans major versions, temporarily
226-
* disabling the backcompat tests is necessary. This flag controls
227-
* the enabled state of every bwc task. It should be set back to true
228-
* after the backport of the backcompat code is complete.
229-
*/
230-
224+
// TODO: This flag existed as a mechanism to disable bwc tests during a backport. It is no
225+
// longer used for that purpose, but instead a way to run only functional tests. We should
226+
// rework the functionalTests task to be more explicit about which tasks it wants to run
227+
// so that that this flag is no longer needed.
231228
boolean bwc_tests_enabled = true
232-
// place a PR link here when committing bwc changes:
233-
String bwc_tests_disabled_issue = ""
234-
if (bwc_tests_enabled == false) {
235-
if (bwc_tests_disabled_issue.isEmpty()) {
236-
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
237-
}
238-
println "========================= WARNING ========================="
239-
println " Backwards compatibility tests are disabled!"
240-
println "See ${bwc_tests_disabled_issue}"
241-
println "==========================================================="
242-
}
243229
if (project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") || it == 'functionalTests' }) {
244230
// Disable BWC tests for checkPart* tasks and platform support tests as it's expected that this will run on it's own check
245231
bwc_tests_enabled = false

docs/changelog/119296.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 119296
2+
summary: Fix writing for LOOKUP status
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 119086

docs/changelog/119310.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 119310
2+
summary: Remove ChunkedToXContentBuilder
3+
area: "Network"
4+
type: bug
5+
issues:
6+
- 118647

docs/reference/api-conventions.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can pass an `X-Opaque-Id` HTTP header to track the origin of a request in
2828

2929
* Response of any request that includes the header
3030
* <<_identifying_running_tasks,Task management API>> response
31-
* <<_identifying_search_slow_log_origin,Slow logs>>
31+
* <<search-slow-log,Slow logs>>
3232
* <<deprecation-logging,Deprecation logs>>
3333

3434
For the deprecation logs, {es} also uses the `X-Opaque-Id` value to throttle
@@ -52,7 +52,7 @@ safely generate a unique `traceparent` header for each request.
5252
If provided, {es} surfaces the header's `trace-id` value as `trace.id` in the:
5353

5454
* <<logging,JSON {es} server logs>>
55-
* <<_identifying_search_slow_log_origin,Slow logs>>
55+
* <<search-slow-log,Slow logs>>
5656
* <<deprecation-logging,Deprecation logs>>
5757

5858
For example, the following `traceparent` value would produce the following

docs/reference/how-to/search-speed.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,3 +567,8 @@ also possible to update the client-side logic in order to route queries to the
567567
relevant indices based on filters. However `constant_keyword` makes it
568568
transparently and allows to decouple search requests from the index topology in
569569
exchange of very little overhead.
570+
571+
[discrete]
572+
=== Default search timeout
573+
574+
By default, search requests don't time out. You can set a timeout using the <<search-timeout,`search.default_search_timeout`>> setting.

0 commit comments

Comments
 (0)