Skip to content

Commit cefc2ac

Browse files
authored
Fix and unmute testTsdbTemplatesNoKeywordFieldType (#136013)
1 parent 90ea9d3 commit cefc2ac

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,16 @@ public void testTsdbTemplatesNoKeywordFieldType() throws Exception {
325325
}
326326
}""";
327327
var request = new TransportPutComposableIndexTemplateAction.Request("id");
328+
Settings.Builder settingsBuilder = Settings.builder()
329+
.put("index.mode", "time_series")
330+
.put("index.dimensions_tsid_strategy_enabled", randomDouble() < 0.8);
331+
if (randomBoolean()) {
332+
settingsBuilder.put("index.routing_path", "metricset");
333+
}
328334
request.indexTemplate(
329335
ComposableIndexTemplate.builder()
330336
.indexPatterns(List.of("k8s*"))
331-
.template(
332-
new Template(
333-
Settings.builder()
334-
.put("index.mode", "time_series")
335-
.put("index.routing_path", randomBoolean() ? null : "metricset")
336-
.put("index.dimensions_tsid_strategy_enabled", randomDouble() < 0.8)
337-
.build(),
338-
new CompressedXContent(mappingTemplate),
339-
null
340-
)
341-
)
337+
.template(new Template(settingsBuilder.build(), new CompressedXContent(mappingTemplate), null))
342338
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
343339
.build()
344340
);

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,6 @@ tests:
579579
- class: org.elasticsearch.indices.recovery.IndexRecoveryIT
580580
method: testUsesFileBasedRecoveryIfOperationsBasedRecoveryWouldBeUnreasonable
581581
issue: https://github.com/elastic/elasticsearch/issues/135737
582-
- class: org.elasticsearch.datastreams.TSDBIndexingIT
583-
method: testTsdbTemplatesNoKeywordFieldType
584-
issue: https://github.com/elastic/elasticsearch/issues/135746
585582
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IncreaseTests
586583
method: testGroupingAggregate {TestCase=<small positive doubles>}
587584
issue: https://github.com/elastic/elasticsearch/issues/135752

0 commit comments

Comments
 (0)