honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TODO in SnapshotIT (#55465) (#55469)

Browse Source 
This TODO became fixable with #54765
This commit is contained in:
Armin Braun 2020-04-20 18:23:31 +02:00 committed by GitHub
parent 7817948926
commit e0195fa1a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java
View File

@ -165,23 +165,12 @@ public class SnapshotIT extends ESRestHighLevelClientTestCase {
CreateSnapshotResponse response = createTestSnapshot(request);
assertEquals(waitForCompletion ? RestStatus.OK : RestStatus.ACCEPTED, response.status());
if (waitForCompletion == false) {
// busy assert on the delete because a known race condition could cause the delete request to not see
// the snapshot if delete and snapshot finalization happen at the same time
// See https://github.com/elastic/elasticsearch/issues/53509#issuecomment-603899620 for details
// TODO: Remove busy assert in 7.x+ once this race is fixed
assertBusy(() -> {
// If we don't wait for the snapshot to complete we have to cancel it to not leak the snapshot task
AcknowledgedResponse deleteResponse;
try {
deleteResponse = execute(
new DeleteSnapshotRequest(repository, snapshot),
highLevelClient().snapshot()::delete, highLevelClient().snapshot()::deleteAsync
);
} catch (Exception e) {
throw new AssertionError(e);
}
assertTrue(deleteResponse.isAcknowledged());
});
// If we don't wait for the snapshot to complete we have to cancel it to not leak the snapshot task
AcknowledgedResponse deleteResponse = execute(
new DeleteSnapshotRequest(repository, snapshot),
highLevelClient().snapshot()::delete, highLevelClient().snapshot()::deleteAsync
);
assertTrue(deleteResponse.isAcknowledged());
}
}