From 45f0d99e04218fa13f8b2d5bb445b3b2587ec19a Mon Sep 17 00:00:00 2001 From: Salvatore Campagna Date: Thu, 13 Jul 2023 11:35:30 +0200 Subject: [PATCH] fix: compilation error --- .../cluster/metadata/DataLifecycleTests.java | 20 +++++++++++-------- .../MetadataIndexTemplateServiceTests.java | 7 ++++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataLifecycleTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataLifecycleTests.java index a128ba8629749..bc7602a4bc417 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DataLifecycleTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DataLifecycleTests.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -38,6 +39,8 @@ public class DataLifecycleTests extends AbstractXContentSerializingTestCase { + public static final TimeValue TIMEOUT = new TimeValue(1, TimeUnit.MINUTES); + @Override protected Writeable.Reader instanceReader() { return DataLifecycle::new; @@ -151,11 +154,11 @@ public void testInvalidDownsamplingConfiguration() { List.of( new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(10), - new DownsampleConfig(new DateHistogramInterval("2h")) + new DownsampleConfig(new DateHistogramInterval("2h"), TIMEOUT) ), new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(3), - new DownsampleConfig(new DateHistogramInterval("2h")) + new DownsampleConfig(new DateHistogramInterval("2h"), TIMEOUT) ) ) ) @@ -172,11 +175,11 @@ public void testInvalidDownsamplingConfiguration() { List.of( new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(10), - new DownsampleConfig(new DateHistogramInterval("2h")) + new DownsampleConfig(new DateHistogramInterval("2h"), TIMEOUT) ), new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(30), - new DownsampleConfig(new DateHistogramInterval("2h")) + new DownsampleConfig(new DateHistogramInterval("2h"), TIMEOUT) ) ) ) @@ -190,11 +193,11 @@ public void testInvalidDownsamplingConfiguration() { List.of( new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(10), - new DownsampleConfig(new DateHistogramInterval("2h")) + new DownsampleConfig(new DateHistogramInterval("2h"), TIMEOUT) ), new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(30), - new DownsampleConfig(new DateHistogramInterval("3h")) + new DownsampleConfig(new DateHistogramInterval("3h"), TIMEOUT) ) ) ) @@ -234,7 +237,7 @@ private static DataLifecycle.Downsampling randomDownsampling() { List rounds = new ArrayList<>(); var previous = new DataLifecycle.Downsampling.Round( TimeValue.timeValueDays(randomIntBetween(1, 365)), - new DownsampleConfig(new DateHistogramInterval(randomIntBetween(1, 24) + "h")) + new DownsampleConfig(new DateHistogramInterval(randomIntBetween(1, 24) + "h"), TIMEOUT) ); rounds.add(previous); for (int i = 0; i < count; i++) { @@ -250,7 +253,8 @@ private static DataLifecycle.Downsampling randomDownsampling() { private static DataLifecycle.Downsampling.Round nextRound(DataLifecycle.Downsampling.Round previous) { var after = TimeValue.timeValueDays(previous.after().days() + randomIntBetween(1, 10)); var fixedInterval = new DownsampleConfig( - new DateHistogramInterval((previous.config().getFixedInterval().estimateMillis() * randomIntBetween(2, 5)) + "ms") + new DateHistogramInterval((previous.config().getFixedInterval().estimateMillis() * randomIntBetween(2, 5)) + "ms"), + TIMEOUT ); return new DataLifecycle.Downsampling.Round(after, fixedInterval); } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index 84a6e03ce8cc5..be15dbd1ddac5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -78,6 +78,8 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { + public static final TimeValue TIMEOUT = new TimeValue(1, TimeUnit.MINUTES); + @Override protected Settings nodeSettings() { // Disable the health node selection so the task assignment does not interfere with the cluster state during the test @@ -1512,7 +1514,10 @@ public void testResolveLifecycle() throws Exception { new DataLifecycle.Retention(TimeValue.timeValueDays(45)), new DataLifecycle.Downsampling( List.of( - new DataLifecycle.Downsampling.Round(TimeValue.timeValueDays(30), new DownsampleConfig(new DateHistogramInterval("3h"))) + new DataLifecycle.Downsampling.Round( + TimeValue.timeValueDays(30), + new DownsampleConfig(new DateHistogramInterval("3h"), TIMEOUT) + ) ) ) );