Skip to content

Commit 3324f0a

Browse files
tlrxtlrx
authored
[Test] Fix TSDBIndexingIT.testDynamicDimensions and more (#138825)
The `index.mapping.use_synthetic_id` is not registered on non-snapshot build so that simply fails the template creation. I adjusted some tests but forgot to adjust all other tests in the class. This is now done. Closes #138815
1 parent 074dc72 commit 3324f0a

File tree

2 files changed

+68
-90
lines changed

2 files changed

+68
-90
lines changed

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

Lines changed: 68 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -588,20 +588,15 @@ public void testTrimId() throws Exception {
588588
public void testReindexing() throws Exception {
589589
String dataStreamName = "my-ds";
590590
String reindexedDataStreamName = "my-reindexed-ds";
591+
var templateSettings = Settings.builder().put("index.mode", "time_series");
592+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
593+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
594+
}
591595
var putTemplateRequest = new TransportPutComposableIndexTemplateAction.Request("id");
592596
putTemplateRequest.indexTemplate(
593597
ComposableIndexTemplate.builder()
594598
.indexPatterns(List.of(dataStreamName, reindexedDataStreamName))
595-
.template(
596-
new Template(
597-
Settings.builder()
598-
.put("index.mode", "time_series")
599-
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
600-
.build(),
601-
new CompressedXContent(MAPPING_TEMPLATE),
602-
null
603-
)
604-
)
599+
.template(new Template(templateSettings.build(), new CompressedXContent(MAPPING_TEMPLATE), null))
605600
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
606601
.build()
607602
);
@@ -650,20 +645,16 @@ public void testAddDimensionToMapping() throws Exception {
650645
String dataStreamName = "my-ds";
651646
var putTemplateRequest = new TransportPutComposableIndexTemplateAction.Request("id");
652647
boolean indexDimensionsTsidStrategyEnabled = randomBoolean();
648+
var templateSettings = Settings.builder()
649+
.put("index.mode", "time_series")
650+
.put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabled);
651+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
652+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
653+
}
653654
putTemplateRequest.indexTemplate(
654655
ComposableIndexTemplate.builder()
655656
.indexPatterns(List.of(dataStreamName))
656-
.template(
657-
new Template(
658-
Settings.builder()
659-
.put("index.mode", "time_series")
660-
.put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabled)
661-
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
662-
.build(),
663-
new CompressedXContent(MAPPING_TEMPLATE),
664-
null
665-
)
666-
)
657+
.template(new Template(templateSettings.build(), new CompressedXContent(MAPPING_TEMPLATE), null))
667658
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
668659
.build()
669660
);
@@ -740,44 +731,39 @@ public void testAddDimensionToMapping() throws Exception {
740731

741732
public void testDynamicStringDimensions() throws Exception {
742733
String dataStreamName = "my-ds";
734+
var templateSettings = Settings.builder().put("index.mode", "time_series");
735+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
736+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
737+
}
743738
var putTemplateRequest = new TransportPutComposableIndexTemplateAction.Request("id");
744739
putTemplateRequest.indexTemplate(
745740
ComposableIndexTemplate.builder()
746741
.indexPatterns(List.of(dataStreamName))
747-
.template(
748-
new Template(
749-
Settings.builder()
750-
.put("index.mode", "time_series")
751-
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
752-
.build(),
753-
new CompressedXContent("""
754-
{
755-
"_doc": {
756-
"dynamic_templates": [
757-
{
758-
"labels": {
759-
"match_mapping_type": "string",
760-
"mapping": {
761-
"type": "keyword",
762-
"time_series_dimension": true
763-
}
764-
}
765-
}
766-
],
767-
"properties": {
768-
"@timestamp": {
769-
"type": "date"
770-
},
771-
"metricset": {
772-
"type": "keyword",
773-
"time_series_dimension": true
774-
}
775-
}
742+
.template(new Template(templateSettings.build(), new CompressedXContent("""
743+
{
744+
"_doc": {
745+
"dynamic_templates": [
746+
{
747+
"labels": {
748+
"match_mapping_type": "string",
749+
"mapping": {
750+
"type": "keyword",
751+
"time_series_dimension": true
776752
}
777-
}"""),
778-
null
779-
)
780-
)
753+
}
754+
}
755+
],
756+
"properties": {
757+
"@timestamp": {
758+
"type": "date"
759+
},
760+
"metricset": {
761+
"type": "keyword",
762+
"time_series_dimension": true
763+
}
764+
}
765+
}
766+
}"""), null))
781767
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
782768
.build()
783769
);
@@ -811,44 +797,39 @@ public void testDynamicStringDimensions() throws Exception {
811797

812798
public void testDynamicDimensions() throws Exception {
813799
String dataStreamName = "my-ds";
800+
var templateSettings = Settings.builder().put("index.mode", "time_series");
801+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
802+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
803+
}
814804
var putTemplateRequest = new TransportPutComposableIndexTemplateAction.Request("id");
815805
putTemplateRequest.indexTemplate(
816806
ComposableIndexTemplate.builder()
817807
.indexPatterns(List.of(dataStreamName))
818-
.template(
819-
new Template(
820-
Settings.builder()
821-
.put("index.mode", "time_series")
822-
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
823-
.build(),
824-
new CompressedXContent("""
825-
826-
{
827-
"_doc": {
828-
"dynamic_templates": [
829-
{
830-
"label": {
831-
"mapping": {
832-
"type": "keyword",
833-
"time_series_dimension": true
834-
}
835-
}
836-
}
837-
],
838-
"properties": {
839-
"@timestamp": {
840-
"type": "date"
841-
},
842-
"metricset": {
843-
"type": "keyword",
844-
"time_series_dimension": true
845-
}
846-
}
808+
.template(new Template(templateSettings.build(), new CompressedXContent("""
809+
810+
{
811+
"_doc": {
812+
"dynamic_templates": [
813+
{
814+
"label": {
815+
"mapping": {
816+
"type": "keyword",
817+
"time_series_dimension": true
847818
}
848-
}"""),
849-
null
850-
)
851-
)
819+
}
820+
}
821+
],
822+
"properties": {
823+
"@timestamp": {
824+
"type": "date"
825+
},
826+
"metricset": {
827+
"type": "keyword",
828+
"time_series_dimension": true
829+
}
830+
}
831+
}
832+
}"""), null))
852833
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
853834
.build()
854835
);

‎muted-tests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,6 @@ tests:
466466
- class: org.elasticsearch.index.mapper.LongSyntheticSourceNativeArrayIntegrationTests
467467
method: testSynthesizeArrayRandom
468468
issue: https://github.com/elastic/elasticsearch/issues/138819
469-
- class: org.elasticsearch.datastreams.TSDBIndexingIT
470-
method: testDynamicDimensions
471-
issue: https://github.com/elastic/elasticsearch/issues/138815
472469
- class: org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT
473470
issue: https://github.com/elastic/elasticsearch/issues/138796
474471

0 commit comments

Comments
 (0)