Skip to content

Commit 2593151

Browse files
Merge branch 'main' into maximum-timestamp-in-get-data-streams
2 parents 7901f1f + 0fe220a commit 2593151

File tree

25 files changed

+3375
-157
lines changed

25 files changed

+3375
-157
lines changed

benchmarks/build.gradle

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.elasticsearch.gradle.internal.info.BuildParams
2+
import org.elasticsearch.gradle.internal.test.TestUtil
23

34
/*
45
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -29,6 +30,7 @@ tasks.named("javadoc").configure { enabled = false }
2930
configurations {
3031
expression
3132
painless
33+
nativeLib
3234
}
3335

3436
dependencies {
@@ -45,6 +47,7 @@ dependencies {
4547
implementation project(path: ':libs:elasticsearch-simdvec')
4648
expression(project(path: ':modules:lang-expression', configuration: 'zip'))
4749
painless(project(path: ':modules:lang-painless', configuration: 'zip'))
50+
nativeLib(project(':libs:elasticsearch-native'))
4851
api "org.openjdk.jmh:jmh-core:$versions.jmh"
4952
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
5053
// Dependencies of JMH
@@ -76,17 +79,8 @@ tasks.register("copyPainless", Copy) {
7679
tasks.named("run").configure {
7780
executable = "${BuildParams.runtimeJavaHome}/bin/java"
7881
args << "-Dplugins.dir=${buildDir}/plugins" << "-Dtests.index=${buildDir}/index"
79-
dependsOn "copyExpression", "copyPainless"
80-
systemProperty 'es.nativelibs.path', file("../libs/native/libraries/build/platform/${platformName()}-${os.arch}")
81-
}
82-
83-
String platformName() {
84-
String name = System.getProperty("os.name");
85-
if (name.startsWith("Mac")) {
86-
return "darwin";
87-
} else {
88-
return name.toLowerCase(Locale.ROOT);
89-
}
82+
dependsOn "copyExpression", "copyPainless", configurations.nativeLib
83+
systemProperty 'es.nativelibs.path', TestUtil.getTestLibraryPath(file("../libs/native/libraries/build/platform/").toString())
9084
}
9185

9286
spotless {

docs/changelog/112066.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 112066
2+
summary: Do not treat replica as unassigned if primary recently created and unassigned
3+
time is below a threshold
4+
area: Health
5+
type: enhancement
6+
issues: []

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ tests:
160160
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
161161
method: testDeleteJobAsync
162162
issue: https://github.com/elastic/elasticsearch/issues/112212
163-
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
164-
method: test {p0=indices.create/20_synthetic_source/stored field under object with store_array_source}
165-
issue: https://github.com/elastic/elasticsearch/issues/112264
166163
- class: org.elasticsearch.search.query.ScriptScoreQueryTests
167164
method: testScriptTermStatsAvailable
168165
issue: https://github.com/elastic/elasticsearch/issues/112278

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,8 +1342,8 @@ subobjects auto:
13421342
# 112156
13431343
stored field under object with store_array_source:
13441344
- requires:
1345-
cluster_features: ["mapper.track_ignored_source"]
1346-
reason: requires tracking ignored source
1345+
cluster_features: ["mapper.source.synthetic_source_stored_fields_advance_fix"]
1346+
reason: requires bug fix to be implemented
13471347

13481348
- do:
13491349
indices.create:

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java

Lines changed: 708 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)