migrate cleanup of ILM to ESRestTestCase

related #34530.

Author: talevy

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -210,7 +210,8 @@ protected static RestClient adminClient() {
     /**
      * Returns whether to preserve the state of the cluster upon completion of this test. Defaults to false. If true, overrides the value of
      * {@link #preserveIndicesUponCompletion()}, {@link #preserveTemplatesUponCompletion()}, {@link #preserveReposUponCompletion()},
-     * {@link #preserveSnapshotsUponCompletion()}, and {@link #preserveRollupJobsUponCompletion()}.
+     * {@link #preserveSnapshotsUponCompletion()},{@link #preserveRollupJobsUponCompletion()},
+     * and {@link #preserveILMPoliciesUponCompletion()}.
      *
      * @return true if the state of the cluster should be preserved
      */
@@ -275,6 +276,15 @@ protected boolean preserveRollupJobsUponCompletion() {
         return false;
     }
 
+    /**
+     * Returns whether to preserve ILM Policies of this test. Defaults to not
+     * preserviing them. Only runs at all if xpack is installed on the cluster
+     * being tested.
+     */
+    protected boolean preserveILMPoliciesUponCompletion() {
+        return false;
+    }
+
     private void wipeCluster() throws Exception {
         boolean hasXPack = hasXPack();
 
@@ -329,6 +339,11 @@ private void wipeCluster() throws Exception {
             wipeRollupJobs();
             waitForPendingRollupTasks();
         }
+
+        if (hasXPack && false == preserveILMPoliciesUponCompletion()) {
+            removePoliciesFromAllIndexes();
+            deleteAllPolicies();
+        }
     }
 
     /**
@@ -441,6 +456,46 @@ private void waitForPendingRollupTasks() throws Exception {
         });
     }
 
+    private static void removePoliciesFromAllIndexes() throws IOException {
+        Response response = adminClient().performRequest(new Request("GET", "/_all"));
+        Map<String, Object> indexes = ESRestTestCase.entityAsMap(response);
+
+        if (indexes == null || indexes.isEmpty()) {
+            return;
+        }
+
+        for (String indexName : indexes.keySet()) {
+            try {
+                adminClient().performRequest(new Request("DELETE", indexName + "/_ilm/"));
+            } catch (Exception e) {
+                // ok
+            }
+        }
+    }
+
+    private static void deleteAllPolicies() throws Exception {
+        Map<String, Object> policies;
+
+        try {
+            Response response = adminClient().performRequest(new Request("GET", "/_ilm"));
+            policies = ESRestTestCase.entityAsMap(response);
+        } catch (Exception e) {
+            return;
+        }
+
+        if (policies == null || policies.isEmpty()) {
+            return;
+        }
+
+        for (String policyName : policies.keySet()) {
+            try {
+                adminClient().performRequest(new Request("DELETE", "/_ilm/" + policyName));
+            } catch (Exception e) {
+                // ok
+            }
+        }
+    }
+
     /**
      * Logs a message if there are still running tasks. The reasoning is that any tasks still running are state the is trying to bleed into
      * other tests.

test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java

@@ -66,4 +66,9 @@ protected boolean preserveClusterSettings() {
     protected boolean preserveRollupJobsUponCompletion() {
         return true;
     }
+
+    @Override
+    protected boolean preserveILMPoliciesUponCompletion() {
+        return true;
+    }
 }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ILMRestTestStateCleaner.java

@@ -21,7 +21,6 @@
 import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.elasticsearch.test.rest.yaml.ObjectPath;
-import org.elasticsearch.xpack.core.indexlifecycle.ILMRestTestStateCleaner;
 import org.elasticsearch.xpack.core.ml.MlMetaIndex;
 import org.elasticsearch.xpack.core.ml.integration.MlRestTestStateCleaner;
 import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
@@ -245,7 +244,6 @@ private void disableMonitoring() throws Exception {
     public void cleanup() throws Exception {
         disableMonitoring();
         clearMlState();
-        clearILMState();
         if (isWaitForPendingTasks()) {
             // This waits for pending tasks to complete, so must go last (otherwise
             // it could be waiting for pending tasks while monitoring is still running).
@@ -265,20 +263,6 @@ private void clearMlState() throws Exception {
         }
     }
 
-    private void clearILMState() throws Exception {
-        if (isILMTest()) {
-            ILMRestTestStateCleaner.clearILMMetadata(adminClient());
-        }
-    }
-
-    /**
-
-    private void clearILMState() throws Exception {
-        if (isILMTest()) {
-            ILMRestTestStateCleaner.clearILMMetadata(adminClient());
-        }
-    }
-
     /**
      * Executes an API call using the admin context, waiting for it to succeed.
      */
@@ -339,12 +323,6 @@ protected boolean isMachineLearningTest() {
         return testName != null && (testName.contains("=ml/") || testName.contains("=ml\\"));
     }
 
-    protected boolean isILMTest() {
-        String testName = getTestName();
-        return testName != null && (testName.contains("=ilm/") || testName.contains("=ilm\\"))
-                || (testName.contains("/ilm/") || testName.contains("\\ilm\\"));
-    }
-
     /**
      * Should each test wait for pending tasks to finish after execution?
      * @return Wait for pending tasks

x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java

@@ -29,6 +29,11 @@ protected boolean preserveRollupJobsUponCompletion() {
         return true;
     }
 
+    @Override
+    protected boolean preserveILMPoliciesUponCompletion() {
+        return true;
+    }
+
     enum CLUSTER_TYPE {
         OLD,
         MIXED,

x-pack/qa/rolling-upgrade-basic/src/test/java/org/elasticsearch/upgrades/AbstractUpgradeTestCase.java

@@ -43,6 +43,11 @@ protected boolean preserveRollupJobsUponCompletion() {
         return true;
     }
 
+    @Override
+    protected boolean preserveILMPoliciesUponCompletion() {
+        return true;
+    }
+
     enum ClusterType {
         OLD,
         MIXED,

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/AbstractUpgradeTestCase.java

@@ -47,6 +47,11 @@ protected boolean preserveRollupJobsUponCompletion() {
         return true;
     }
 
+    @Override
+    protected boolean preserveILMPoliciesUponCompletion() {
+        return true;
+    }
+
     public UpgradeClusterClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
         super(testCandidate);
     }