From 402561bac0b22f94107cf6940dd9218a4f5d4dd4 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 11 Sep 2023 07:54:38 +0200 Subject: [PATCH] Tweaked DownsampleClusterDisruptionIT and (#98523) unmuted DownsampleClusterDisruptionIT.testDownsampleIndexWithRollingRestart() and DownsampleClusterDisruptionIT.testDownsampleIndexWithFullClusterRestart() tests Relates to #98485 --- .../xpack/downsample/DownsampleClusterDisruptionIT.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java index b122b59813b43..84b55a5fa8009 100644 --- a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java +++ b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java @@ -209,7 +209,6 @@ public boolean validateClusterForming() { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98485") public void testDownsampleIndexWithRollingRestart() throws Exception { try (InternalTestCluster cluster = internalCluster()) { final List masterNodes = cluster.startMasterOnlyNodes(1); @@ -296,11 +295,10 @@ private void startDownsampleTaskDuringDisruption( } catch (Exception e) { throw new AssertionError(e); } - }, 60, TimeUnit.SECONDS); + }, 120, TimeUnit.SECONDS); disruptionEnd.await(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98485") public void testDownsampleIndexWithFullClusterRestart() throws Exception { try (InternalTestCluster cluster = internalCluster()) { final List masterNodes = cluster.startMasterOnlyNodes(1); @@ -428,7 +426,7 @@ private void downsample(final String sourceIndex, final String downsampleIndex, assertAcked( internalCluster().client() .execute(DownsampleAction.INSTANCE, new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config)) - .actionGet() + .actionGet(TIMEOUT.millis()) ); }