From eaf34bb57d10167c01183c4d1c36d44fba709b3c Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Tue, 21 Jul 2020 17:46:54 +0200 Subject: [PATCH] Increase Timeout in testSLMRetentionAfterRestore (#59979) This test failed by hitting the 10s default busy assert timeout. Given how involved the retention run is (multiple disk reads, CS updates etc.) we should have a higher timeout here. Also, removed the pointless delete call for the snapshot that we just asserted is gone, at the end of the test. Closes #59956 --- .../xpack/slm/SLMSnapshotBlockingIntegTests.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java index fb7933ca26d4..58bc2166ab79 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java @@ -429,14 +429,7 @@ public class SLMSnapshotBlockingIntegTests extends AbstractSnapshotIntegTestCase // This is what we want to happen } logger.info("--> snapshot [{}] has been deleted", snapshotName); - }); - - // Cancel/delete the snapshot - try { - client().admin().cluster().prepareDeleteSnapshot(REPO, snapshotName).get(); - } catch (SnapshotMissingException e) { - // ignore - } + }, 30L, TimeUnit.SECONDS); } private SnapshotsStatusResponse getSnapshotStatus(String snapshotName) {