Skip to content

Commit

Permalink
Merge branch 'main' into maximum-timestamp-in-get-data-streams
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Aug 28, 2024
2 parents 7901f1f + 0fe220a commit 2593151
Show file tree
Hide file tree
Showing 25 changed files with 3,375 additions and 157 deletions.
16 changes: 5 additions & 11 deletions benchmarks/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.elasticsearch.gradle.internal.info.BuildParams
import org.elasticsearch.gradle.internal.test.TestUtil

/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
Expand Down Expand Up @@ -29,6 +30,7 @@ tasks.named("javadoc").configure { enabled = false }
configurations {
expression
painless
nativeLib
}

dependencies {
Expand All @@ -45,6 +47,7 @@ dependencies {
implementation project(path: ':libs:elasticsearch-simdvec')
expression(project(path: ':modules:lang-expression', configuration: 'zip'))
painless(project(path: ':modules:lang-painless', configuration: 'zip'))
nativeLib(project(':libs:elasticsearch-native'))
api "org.openjdk.jmh:jmh-core:$versions.jmh"
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
// Dependencies of JMH
Expand Down Expand Up @@ -76,17 +79,8 @@ tasks.register("copyPainless", Copy) {
tasks.named("run").configure {
executable = "${BuildParams.runtimeJavaHome}/bin/java"
args << "-Dplugins.dir=${buildDir}/plugins" << "-Dtests.index=${buildDir}/index"
dependsOn "copyExpression", "copyPainless"
systemProperty 'es.nativelibs.path', file("../libs/native/libraries/build/platform/${platformName()}-${os.arch}")
}

String platformName() {
String name = System.getProperty("os.name");
if (name.startsWith("Mac")) {
return "darwin";
} else {
return name.toLowerCase(Locale.ROOT);
}
dependsOn "copyExpression", "copyPainless", configurations.nativeLib
systemProperty 'es.nativelibs.path', TestUtil.getTestLibraryPath(file("../libs/native/libraries/build/platform/").toString())
}

spotless {
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog/112066.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 112066
summary: Do not treat replica as unassigned if primary recently created and unassigned
time is below a threshold
area: Health
type: enhancement
issues: []
3 changes: 0 additions & 3 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ tests:
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
method: testDeleteJobAsync
issue: https://github.com/elastic/elasticsearch/issues/112212
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=indices.create/20_synthetic_source/stored field under object with store_array_source}
issue: https://github.com/elastic/elasticsearch/issues/112264
- class: org.elasticsearch.search.query.ScriptScoreQueryTests
method: testScriptTermStatsAvailable
issue: https://github.com/elastic/elasticsearch/issues/112278
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1342,8 +1342,8 @@ subobjects auto:
# 112156
stored field under object with store_array_source:
- requires:
cluster_features: ["mapper.track_ignored_source"]
reason: requires tracking ignored source
cluster_features: ["mapper.source.synthetic_source_stored_fields_advance_fix"]
reason: requires bug fix to be implemented

- do:
indices.create:
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 2593151

Please sign in to comment.