From 76bdc705bfb0fe8c4631cc0ab0e77aea0365445d Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Tue, 8 Feb 2022 15:19:01 +0100 Subject: [PATCH 1/4] Place index_mode field behind feature flag. Ensure that `index_mode` field in data stream template is behind `es.index_mode_feature_flag_registered` feature flag. This was not the case. --- .../cluster/metadata/ComposableIndexTemplate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index 0c34449fdea20..093264645a4c7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -18,6 +18,7 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Nullable; import org.elasticsearch.index.IndexMode; +import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.xcontent.ConstructingObjectParser; @@ -320,7 +321,9 @@ public static class DataStreamTemplate implements Writeable, ToXContentObject { static { PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), HIDDEN); PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), ALLOW_CUSTOM_ROUTING); - PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), INDEX_MODE); + if (IndexSettings.isTimeSeriesModeEnabled()) { + PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), INDEX_MODE); + } } private final boolean hidden; From 4d93cecfaff6a8bd6e8c28675e9624f59c9ce1ff Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Tue, 8 Feb 2022 17:51:32 +0100 Subject: [PATCH 2/4] include feature flag in test and internalClusterTest task --- modules/data-streams/build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/data-streams/build.gradle b/modules/data-streams/build.gradle index 9951e2a3e1f54..5d0b199a8f270 100644 --- a/modules/data-streams/build.gradle +++ b/modules/data-streams/build.gradle @@ -51,3 +51,16 @@ if (BuildParams.inFipsJvm){ tasks.named("javaRestTest").configure{enabled = false } tasks.named("yamlRestTest").configure{enabled = false } } + +if (BuildParams.isSnapshotBuild() == false) { + tasks.named("test").configure { + systemProperty 'es.index_mode_feature_flag_registered', 'true' + } +} + +if (BuildParams.isSnapshotBuild() == false) { + tasks.named("internalClusterTest").configure { + systemProperty 'es.index_mode_feature_flag_registered', 'true' + } +} + From 0d2fb27592db0800056cb01c2219629afa0fffa0 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 9 Feb 2022 10:29:28 +0100 Subject: [PATCH 3/4] iter --- .../cluster/metadata/ComposableIndexTemplate.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index 093264645a4c7..55063ce658d46 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -313,7 +313,12 @@ public static class DataStreamTemplate implements Writeable, ToXContentObject { "data_stream_template", false, args -> { - IndexMode indexMode = args[2] != null ? IndexMode.fromString((String) args[2]) : null; + IndexMode indexMode; + if (IndexSettings.isTimeSeriesModeEnabled()) { + indexMode = args[2] != null ? IndexMode.fromString((String) args[2]) : null; + } else { + indexMode = null; + } return new DataStreamTemplate(args[0] != null && (boolean) args[0], args[1] != null && (boolean) args[1], indexMode); } ); From 934d6670743d88fddba1ff5ce35b83487194ec52 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 10 Feb 2022 08:42:36 +0100 Subject: [PATCH 4/4] removed unnecessary config --- modules/data-streams/build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/data-streams/build.gradle b/modules/data-streams/build.gradle index 2d1612d5359c1..9faa8036f1cc3 100644 --- a/modules/data-streams/build.gradle +++ b/modules/data-streams/build.gradle @@ -57,9 +57,3 @@ if (BuildParams.isSnapshotBuild() == false) { systemProperty 'es.index_mode_feature_flag_registered', 'true' } } - -if (BuildParams.isSnapshotBuild() == false) { - tasks.named("test").configure { - systemProperty 'es.index_mode_feature_flag_registered', 'true' - } -}