honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase Timeouts in SLMBlockingIntegTests (#60356) (#60403) 

The retention run goes through a number of steps and can randomly take more than 10s.
=> increased timeout to 30s like we did in other spots in this test

Also, noticed that we had a hard wait of 10s in this test, removed it and adjusted following
busy assert in a way that can deal with a missing snapshot (from when the assert runs before
the snapshot was put into the CS).

Closes #60336
This commit is contained in:
Armin Braun 2020-07-29 17:34:49 +02:00 committed by GitHub
parent 76359aaa53
commit bfee7b91ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java
View File

@ -363,14 +363,18 @@ public class SLMSnapshotBlockingIntegTests extends AbstractSnapshotIntegTestCase
logger.info("--> waiting for snapshot to complete");
successfulSnapshotName.set(snapshotResponse.get().getSnapshotName());
assertNotNull(successfulSnapshotName.get());
Thread.sleep(TimeValue.timeValueSeconds(10).millis());
logger.info("--> verify that snapshot [{}] succeeded", successfulSnapshotName.get());
assertBusy(() -> {
GetSnapshotsResponse snapshotsStatusResponse = client().admin().cluster()
.prepareGetSnapshots(REPO).setSnapshots(successfulSnapshotName.get()).get();
SnapshotInfo snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
final SnapshotInfo snapshotInfo;
try {
final GetSnapshotsResponse snapshotsStatusResponse = client().admin().cluster()
.prepareGetSnapshots(REPO).setSnapshots(successfulSnapshotName.get()).execute().actionGet();
snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
} catch (SnapshotMissingException sme) {
throw new AssertionError(sme);
}
assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
});
}, 30L, TimeUnit.SECONDS);
}
// Check that the failed snapshot from before still exists, now that retention has run
@ -401,7 +405,7 @@ public class SLMSnapshotBlockingIntegTests extends AbstractSnapshotIntegTestCase
.prepareGetSnapshots(REPO).setSnapshots(successfulSnapshotName.get()).get();
SnapshotInfo snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
});
}, 30L, TimeUnit.SECONDS);
}
}