[8.10] Tweaked DownsampleClusterDisruptionIT and (#99397)

unmuted DownsampleClusterDisruptionIT.testDownsampleIndexWithRollingRestart() and DownsampleClusterDisruptionIT.testDownsampleIndexWithFullClusterRestart() tests Backport of #98523 to 8.10 branch. Relates to #98485
elastic · Sep 12, 2023 · 082350a · 082350a
1 parent a3f4e42
commit 082350a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...nalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java b/...nalClusterTest/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<String> 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<String> 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())
         );
     }