Updated cleanUpCluster in Utility

Author: ezimuel

tests/Utility.php

@@ -167,6 +167,42 @@ public static function cleanUpCluster(Client $client): void
         self::ensureNoInitializingShards($client);
         self::wipeCluster($client);
         self::waitForClusterStateUpdatesToFinish($client);
+        self::checkForUnexpectedlyRecreatedObjects($client);
+    }
+
+    /**
+     * This method checks whether ILM policies or templates get recreated after they have been deleted. If so, we are probably deleting
+     * them unnecessarily, potentially causing test performance problems. This could happen for example if someone adds a new standard ILM
+     * policy but forgets to put it in the exclusion list in this test.
+     *
+     * @see ESRestTestCase.java:checkForUnexpectedlyRecreatedObjects()
+     */
+    private static function checkForUnexpectedlyRecreatedObjects(Client $client): void
+    {
+        if (self::$hasIlm) {
+            $policies = self::getAllUnexpectedIlmPolicies($client);
+            if (!empty($policies)) {
+                throw new Exception(sprintf(
+                    "Expected no ILM policies after deletions, but found %s", 
+                    implode(',', array_keys($policies))
+                ));
+            }
+        }
+    }
+
+    /**
+     * @see ESRestTestCase.java:getAllUnexpectedIlmPolicies()
+     */
+    private static function getAllUnexpectedIlmPolicies(Client $client): array
+    {
+        try {
+            return $client->ilm()->getLifecycle()->asArray();
+        } catch (ClientResponseException $e) {
+            if (in_array($e->getCode(), [400, 405])) {
+                return [];
+            }
+            throw $e;
+        }
     }
 
     /**
@@ -621,9 +657,19 @@ private static function preserveILMPolicyIds(): array
             "ilm-history-ilm-policy", 
             "slm-history-ilm-policy",
             "watch-history-ilm-policy", 
+            "watch-history-ilm-policy-16",
             "ml-size-based-ilm-policy", 
             "logs", 
-            "metrics"
+            "metrics",
+            "synthetics",
+            "7-days-default",
+            "30-days-default",
+            "90-days-default",
+            "180-days-default",
+            "365-days-default",
+            ".fleet-actions-results-ilm-policy",
+            ".deprecation-indexing-ilm-policy",
+            ".monitoring-8-ilm-policy"
         ];
     }