honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 22:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wipe Snapshots Before Indices in RestTests (#39662) (#39763)

Browse Source 
* Wipe Snapshots Before Indices in RestTests

* If we have a snapshot ongoing from the previous test and enter this method, then deleting the indices fails, which in turn fails the whole wipe
   * Fixed by first deleting/aborting snapshots
This commit is contained in:
Armin Braun 2019-03-06 21:48:17 +01:00 committed by GitHub
parent b69affda6a
commit bb2f8485f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View File

@ -36,6 +36,7 @@ import org.elasticsearch.client.ResponseException;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.WarningsHandler; import org.elasticsearch.client.WarningsHandler;
import org.elasticsearch.cluster.SnapshotsInProgress;
import org.elasticsearch.common.CheckedRunnable; import org.elasticsearch.common.CheckedRunnable;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtils;
@ -72,6 +73,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -468,6 +470,8 @@ public abstract class ESRestTestCase extends ESTestCase {
waitForPendingRollupTasks(); waitForPendingRollupTasks();
} }
final Map<String, List<Map<?,?>>> inProgressSnapshots = wipeSnapshots();
if (preserveIndicesUponCompletion() == false) { if (preserveIndicesUponCompletion() == false) {
// wipe indices // wipe indices
try { try {
@ -508,8 +512,6 @@ public abstract class ESRestTestCase extends ESTestCase {
} }
} }
wipeSnapshots();
// wipe cluster settings // wipe cluster settings
if (preserveClusterSettings() == false) { if (preserveClusterSettings() == false) {
wipeClusterSettings(); wipeClusterSettings();
@ -518,14 +520,18 @@ public abstract class ESRestTestCase extends ESTestCase {
if (hasXPack && false == preserveILMPoliciesUponCompletion()) { if (hasXPack && false == preserveILMPoliciesUponCompletion()) {
deleteAllPolicies(); deleteAllPolicies();
} }
assertTrue("Found in progress snapshots [" + inProgressSnapshots + "].", inProgressSnapshots.isEmpty());
} }
/** /**
* Wipe fs snapshots we created one by one and all repositories so that the next test can create the repositories fresh and they'll * Wipe fs snapshots we created one by one and all repositories so that the next test can create the repositories fresh and they'll
* start empty. There isn't an API to delete all snapshots. There is an API to delete all snapshot repositories but that leaves all of * start empty. There isn't an API to delete all snapshots. There is an API to delete all snapshot repositories but that leaves all of
* the snapshots intact in the repository. * the snapshots intact in the repository.
* @return Map of repository name to list of snapshots found in unfinished state
*/ */
private void wipeSnapshots() throws IOException { private Map<String, List<Map<?, ?>>> wipeSnapshots() throws IOException {
final Map<String, List<Map<?, ?>>> inProgressSnapshots = new HashMap<>();
for (Map.Entry<String, ?> repo : entityAsMap(adminClient.performRequest(new Request("GET", "/_snapshot/_all"))).entrySet()) { for (Map.Entry<String, ?> repo : entityAsMap(adminClient.performRequest(new Request("GET", "/_snapshot/_all"))).entrySet()) {
String repoName = repo.getKey(); String repoName = repo.getKey();
Map<?, ?> repoSpec = (Map<?, ?>) repo.getValue(); Map<?, ?> repoSpec = (Map<?, ?>) repo.getValue();
@ -538,6 +544,9 @@ public abstract class ESRestTestCase extends ESTestCase {
for (Object snapshot : snapshots) { for (Object snapshot : snapshots) {
Map<?, ?> snapshotInfo = (Map<?, ?>) snapshot; Map<?, ?> snapshotInfo = (Map<?, ?>) snapshot;
String name = (String) snapshotInfo.get("snapshot"); String name = (String) snapshotInfo.get("snapshot");
if (SnapshotsInProgress.State.valueOf((String) snapshotInfo.get("state")).completed() == false) {
inProgressSnapshots.computeIfAbsent(repoName, key -> new ArrayList<>()).add(snapshotInfo);
}
logger.debug("wiping snapshot [{}/{}]", repoName, name); logger.debug("wiping snapshot [{}/{}]", repoName, name);
adminClient().performRequest(new Request("DELETE", "/_snapshot/" + repoName + "/" + name)); adminClient().performRequest(new Request("DELETE", "/_snapshot/" + repoName + "/" + name));
} }
@ -547,6 +556,7 @@ public abstract class ESRestTestCase extends ESTestCase {
adminClient().performRequest(new Request("DELETE", "_snapshot/" + repoName)); adminClient().performRequest(new Request("DELETE", "_snapshot/" + repoName));
} }
} }
return inProgressSnapshots;
} }
/** /**