diff --git a/muted-tests.yml b/muted-tests.yml index 11e7d4f4894d7..231138c6b0efd 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -498,9 +498,6 @@ tests: - class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT method: test {yaml=indices.validate_query/20_query_string/validate_query with query_string parameters} issue: https://github.com/elastic/elasticsearch/issues/137391 -- class: org.elasticsearch.xpack.downsample.ILMDownsampleDisruptionIT - method: testILMDownsampleRollingRestart - issue: https://github.com/elastic/elasticsearch/issues/137489 - class: org.elasticsearch.smoketest.SmokeTestIngestWithAllDepsClientYamlTestSuiteIT method: test {yaml=ingest/100_sampling_with_reroute/Test get sample with multiple reroutes} issue: https://github.com/elastic/elasticsearch/issues/137457 diff --git a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java index 6909d579b908f..7bbbd93897c45 100644 --- a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java +++ b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java @@ -56,7 +56,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse; import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.xpack.core.rollup.ConfigTestHelpers.randomInterval; import static org.hamcrest.Matchers.equalTo; @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 4) @@ -87,7 +86,8 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { return nodeSettings.build(); } - public void setup(final String sourceIndex, int numOfShards, int numOfReplicas, long startTime) throws IOException { + public void setup(final String sourceIndex, int numOfShards, int numOfReplicas, long startTime, DownsampleConfig config) + throws IOException { final Settings.Builder settings = indexSettings(numOfShards, numOfReplicas).put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES) .putList(IndexMetadata.INDEX_ROUTING_PATH.getKey(), List.of(FIELD_DIMENSION_KEYWORD)) .put( @@ -123,10 +123,10 @@ public void setup(final String sourceIndex, int numOfShards, int numOfReplicas, Map.of( "downsample", new org.elasticsearch.xpack.core.ilm.DownsampleAction( - DateHistogramInterval.HOUR, + config.getFixedInterval(), null, randomBoolean(), - randomSamplingMethod() + config.getSamplingMethod() ) ) ) @@ -145,9 +145,9 @@ public void testILMDownsampleRollingRestart() throws Exception { final String sourceIndex = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); long startTime = LocalDateTime.parse("1993-09-09T18:00:00").atZone(ZoneId.of("UTC")).toInstant().toEpochMilli(); - setup(sourceIndex, 1, 0, startTime); DownsampleConfig.SamplingMethod samplingMethod = randomSamplingMethod(); - final DownsampleConfig config = new DownsampleConfig(randomInterval(), samplingMethod); + final DownsampleConfig config = new DownsampleConfig(DateHistogramInterval.HOUR, samplingMethod); + setup(sourceIndex, 1, 0, startTime, config); final Supplier sourceSupplier = () -> { final String ts = randomDateForInterval(config.getInterval(), startTime); double counterValue = DATE_FORMATTER.parseMillis(ts);