Skip to content

Commit 082350a

Browse files
authored
[8.10] Tweaked DownsampleClusterDisruptionIT and (#99397)
unmuted DownsampleClusterDisruptionIT.testDownsampleIndexWithRollingRestart() and DownsampleClusterDisruptionIT.testDownsampleIndexWithFullClusterRestart() tests Backport of #98523 to 8.10 branch. Relates to #98485
1 parent a3f4e42 commit 082350a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ public boolean validateClusterForming() {
209209
}
210210
}
211211

212-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98485")
213212
public void testDownsampleIndexWithRollingRestart() throws Exception {
214213
try (InternalTestCluster cluster = internalCluster()) {
215214
final List<String> masterNodes = cluster.startMasterOnlyNodes(1);
@@ -296,11 +295,10 @@ private void startDownsampleTaskDuringDisruption(
296295
} catch (Exception e) {
297296
throw new AssertionError(e);
298297
}
299-
}, 60, TimeUnit.SECONDS);
298+
}, 120, TimeUnit.SECONDS);
300299
disruptionEnd.await();
301300
}
302301

303-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98485")
304302
public void testDownsampleIndexWithFullClusterRestart() throws Exception {
305303
try (InternalTestCluster cluster = internalCluster()) {
306304
final List<String> masterNodes = cluster.startMasterOnlyNodes(1);
@@ -428,7 +426,7 @@ private void downsample(final String sourceIndex, final String downsampleIndex,
428426
assertAcked(
429427
internalCluster().client()
430428
.execute(DownsampleAction.INSTANCE, new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config))
431-
.actionGet()
429+
.actionGet(TIMEOUT.millis())
432430
);
433431
}
434432

0 commit comments

Comments
 (0)