From 83120cd4a0e140b7ac3cdcd74beb5c2482614b3e Mon Sep 17 00:00:00 2001 From: Felix Barnsteiner Date: Wed, 8 Oct 2025 09:58:02 +0200 Subject: [PATCH 1/2] Fix and unmute tests in DataStreamIndexSettingsProviderTests --- .../DataStreamIndexSettingsProviderTests.java | 18 +++++++++--------- muted-tests.yml | 6 ------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java index 0b0458905526d..239e1e1428af7 100644 --- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java +++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java @@ -71,7 +71,9 @@ public void testGetAdditionalIndexSettings() throws Exception { String dataStreamName = "logs-app1"; Instant now = Instant.now().truncatedTo(ChronoUnit.SECONDS); - Settings settings = Settings.EMPTY; + Settings settings = Settings.builder() + .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting) + .build(); String mapping = """ { "_doc": { @@ -117,11 +119,8 @@ public void testGetAdditionalIndexSettings() throws Exception { Settings result = additionalSettings.build(); // The index.time_series.end_time setting requires index.mode to be set to time_series adding it here so that we read this setting: // (in production the index.mode setting is usually provided in an index or component template) - result = builder().put(result) - .put("index.mode", "time_series") - .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting) - .build(); - assertThat(result.size(), equalTo(5)); + result = builder().put(result).put("index.mode", "time_series").build(); + assertThat(result.size(), equalTo(4)); assertThat(IndexSettings.MODE.get(result), equalTo(IndexMode.TIME_SERIES)); assertThat(IndexSettings.TIME_SERIES_START_TIME.get(result), equalTo(now.minusMillis(DEFAULT_LOOK_BACK_TIME.getMillis()))); assertThat(IndexSettings.TIME_SERIES_END_TIME.get(result), equalTo(now.plusMillis(DEFAULT_LOOK_AHEAD_TIME.getMillis()))); @@ -187,7 +186,9 @@ public void testGetAdditionalIndexSettingsMappingsMerging() throws Exception { String dataStreamName = "logs-app1"; Instant now = Instant.now().truncatedTo(ChronoUnit.SECONDS); - Settings settings = Settings.EMPTY; + Settings settings = Settings.builder() + .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting) + .build(); String mapping1 = """ { "_doc": { @@ -251,9 +252,8 @@ public void testGetAdditionalIndexSettingsMappingsMerging() throws Exception { // (in production the index.mode setting is usually provided in an index or component template) result = builder().put(result) .put("index.mode", "time_series") - .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting) .build(); - assertThat(result.size(), equalTo(5)); + assertThat(result.size(), equalTo(4)); assertThat(IndexSettings.MODE.get(result), equalTo(IndexMode.TIME_SERIES)); assertThat(IndexSettings.TIME_SERIES_START_TIME.get(result), equalTo(now.minusMillis(DEFAULT_LOOK_BACK_TIME.getMillis()))); assertThat(IndexSettings.TIME_SERIES_END_TIME.get(result), equalTo(now.plusMillis(DEFAULT_LOOK_AHEAD_TIME.getMillis()))); diff --git a/muted-tests.yml b/muted-tests.yml index 97b9e8c0d2299..26c2d5e3475ae 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -612,15 +612,9 @@ tests: - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testOneRemoteClusterPartial issue: https://github.com/elastic/elasticsearch/issues/124055 -- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests - method: testGetAdditionalIndexSettingsMappingsMerging - issue: https://github.com/elastic/elasticsearch/issues/135884 - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT method: testTopNPushedToLuceneOnSortedIndex issue: https://github.com/elastic/elasticsearch/issues/135939 -- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests - method: testGetAdditionalIndexSettings - issue: https://github.com/elastic/elasticsearch/issues/135972 - class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config} issue: https://github.com/elastic/elasticsearch/issues/135975 From 3547fc17ac16a7370dbb40400e7220c6e05e0071 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Wed, 8 Oct 2025 08:06:07 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../datastreams/DataStreamIndexSettingsProviderTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java index 239e1e1428af7..cb01cf65811c7 100644 --- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java +++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java @@ -250,9 +250,7 @@ public void testGetAdditionalIndexSettingsMappingsMerging() throws Exception { Settings result = additionalSettings.build(); // The index.time_series.end_time setting requires index.mode to be set to time_series adding it here so that we read this setting: // (in production the index.mode setting is usually provided in an index or component template) - result = builder().put(result) - .put("index.mode", "time_series") - .build(); + result = builder().put(result).put("index.mode", "time_series").build(); assertThat(result.size(), equalTo(4)); assertThat(IndexSettings.MODE.get(result), equalTo(IndexMode.TIME_SERIES)); assertThat(IndexSettings.TIME_SERIES_START_TIME.get(result), equalTo(now.minusMillis(DEFAULT_LOOK_BACK_TIME.getMillis())));