Skip to content

Commit 5cbebdd

Browse files
weizijunimotov
authored andcommitted
TSDB: fix reindex failed tests without feature flag (elastic#81967)
fix as the elastic#80945 do. register a settings update consumer for the end_time for the tsdb index even when the end_time setting wasn't registered. Pass the feature flag to reindex yaml tests. Co-authored-by: Igor Motov <[email protected]>
1 parent ce1c77b commit 5cbebdd

File tree

12 files changed

+95
-1
lines changed

12 files changed

+95
-1
lines changed

modules/reindex/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ testClusters.configureEach {
3232
module ':modules:lang-painless'
3333
// Whitelist reindexing from the local node so we can test reindex-from-remote.
3434
setting 'reindex.remote.whitelist', '127.0.0.1:*'
35+
if (BuildParams.isSnapshotBuild() == false) {
36+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
37+
}
3538
}
3639

3740
dependencies {
@@ -173,4 +176,3 @@ tasks.named("yamlRestTestV7CompatTransform").configure { task ->
173176

174177
task.addAllowedWarningRegex("\\[types removal\\].*")
175178
}
176-

plugins/analysis-icu/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
/*
24
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
35
* or more contributor license agreements. Licensed under the Elastic License
@@ -25,6 +27,12 @@ dependencies {
2527
api "com.ibm.icu:icu4j:${versions.icu4j}"
2628
}
2729

30+
if (BuildParams.isSnapshotBuild() == false) {
31+
tasks.named("test").configure {
32+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
33+
}
34+
}
35+
2836
restResources {
2937
restApi {
3038
include '_common', 'indices', 'index', 'search'

plugins/mapper-annotated-text/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
/*
24
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
35
* or more contributor license agreements. Licensed under the Elastic License
@@ -14,6 +16,12 @@ esplugin {
1416
classname 'org.elasticsearch.index.mapper.annotatedtext.AnnotatedTextPlugin'
1517
}
1618

19+
if (BuildParams.isSnapshotBuild() == false) {
20+
tasks.named("internalClusterTest").configure {
21+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
22+
}
23+
}
24+
1725
restResources {
1826
restApi {
1927
include '_common', 'indices', 'index', 'search'

plugins/mapper-murmur3/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
/*
24
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
35
* or more contributor license agreements. Licensed under the Elastic License
@@ -19,6 +21,12 @@ dependencies {
1921
testImplementation project(':modules:lang-painless')
2022
}
2123

24+
if (BuildParams.isSnapshotBuild() == false) {
25+
tasks.named("test").configure {
26+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
27+
}
28+
}
29+
2230
restResources {
2331
restApi {
2432
include '_common', 'indices', 'index', 'search'

x-pack/plugin/analytics/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
apply plugin: 'elasticsearch.internal-es-plugin'
24
apply plugin: 'elasticsearch.internal-cluster-test'
35

@@ -17,3 +19,9 @@ dependencies {
1719
testImplementation(project(":client:rest-high-level"))
1820
}
1921

22+
if (BuildParams.isSnapshotBuild() == false) {
23+
tasks.named("test").configure {
24+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
25+
}
26+
}
27+

x-pack/plugin/mapper-aggregate-metric/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
/*
24
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
35
* or more contributor license agreements. Licensed under the Elastic License
@@ -23,3 +25,9 @@ dependencies {
2325
compileOnly project(path: xpackModule('core'))
2426
testImplementation(testArtifact(project(xpackModule('core'))))
2527
}
28+
29+
if (BuildParams.isSnapshotBuild() == false) {
30+
tasks.named("test").configure {
31+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
32+
}
33+
}

x-pack/plugin/mapper-constant-keyword/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
apply plugin: 'elasticsearch.internal-es-plugin'
24
apply plugin: 'elasticsearch.internal-cluster-test'
35
apply plugin: 'elasticsearch.internal-yaml-rest-test'
@@ -16,3 +18,8 @@ dependencies {
1618
internalClusterTestImplementation(testArtifact(project(xpackModule('core'))))
1719
}
1820

21+
if (BuildParams.isSnapshotBuild() == false) {
22+
tasks.named("internalClusterTest").configure {
23+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
24+
}
25+
}

x-pack/plugin/mapper-unsigned-long/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
/*
24
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
35
* or more contributor license agreements. Licensed under the Elastic License
@@ -40,3 +42,15 @@ tasks.named("yamlRestTestV7CompatTest").configure {
4042
'50_script_values/script_score query'
4143
].join(',')
4244
}
45+
46+
if (BuildParams.isSnapshotBuild() == false) {
47+
tasks.named("test").configure {
48+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
49+
}
50+
}
51+
52+
testClusters.configureEach {
53+
if (BuildParams.isSnapshotBuild() == false) {
54+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
55+
}
56+
}

x-pack/plugin/mapper-version/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
evaluationDependsOn(xpackModule('core'))
24

35

@@ -20,3 +22,9 @@ dependencies {
2022
testImplementation(testArtifact(project(xpackModule('core'))))
2123
testImplementation project(path: xpackModule('analytics'))
2224
}
25+
26+
if (BuildParams.isSnapshotBuild() == false) {
27+
tasks.named("test").configure {
28+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
29+
}
30+
}

x-pack/plugin/spatial/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
apply plugin: 'elasticsearch.internal-es-plugin'
24
apply plugin: 'elasticsearch.internal-cluster-test'
35

@@ -21,3 +23,9 @@ testClusters.configureEach {
2123
testDistribution = 'DEFAULT'
2224
setting 'xpack.security.enabled', 'false'
2325
}
26+
27+
if (BuildParams.isSnapshotBuild() == false) {
28+
tasks.named("test").configure {
29+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
30+
}
31+
}

x-pack/plugin/vectors/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
apply plugin: 'elasticsearch.internal-es-plugin'
24
apply plugin: 'elasticsearch.internal-cluster-test'
35

@@ -14,3 +16,9 @@ dependencies {
1416
compileOnly project(path: xpackModule('core'))
1517
testImplementation(testArtifact(project(xpackModule('core'))))
1618
}
19+
20+
if (BuildParams.isSnapshotBuild() == false) {
21+
tasks.named("test").configure {
22+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
23+
}
24+
}

x-pack/plugin/wildcard/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
13
apply plugin: 'elasticsearch.internal-es-plugin'
24

35
esplugin {
@@ -13,3 +15,8 @@ dependencies {
1315
testImplementation(testArtifact(project(xpackModule('core'))))
1416
}
1517

18+
if (BuildParams.isSnapshotBuild() == false) {
19+
tasks.named("test").configure {
20+
systemProperty 'es.index_mode_feature_flag_registered', 'true'
21+
}
22+
}

0 commit comments

Comments
 (0)