TASK: Adapted index removal for ES 2.x

Author: ComiR

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeIndexCommandController.php

@@ -206,17 +206,19 @@ public function buildCommand($limit = null, $update = false, $workspace = null,
     public function cleanupCommand()
     {
         try {
-            $indicesToBeRemoved = $this->nodeIndexer->removeOldIndices();
-            if (count($indicesToBeRemoved) > 0) {
-                foreach ($indicesToBeRemoved as $indexToBeRemoved) {
-                    $this->logger->log('Removing old index ' . $indexToBeRemoved);
+            $removedIndices = $this->nodeIndexer->removeOldIndices();
+            if (count($removedIndices) > 0) {
+                if (count($removedIndices) === 1) {
+                    $this->logger->log('Removed old index ' . $removedIndices[0]);
+                } else {
+                    $this->logger->log('Removed old indices ' . implode(', ', $removedIndices));
                 }
             } else {
                 $this->logger->log('Nothing to remove.');
             }
         } catch (\Flowpack\ElasticSearch\Transfer\Exception\ApiException $exception) {
             $response = json_decode($exception->getResponse());
-            $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s"', $response->status, $response->error));
+            $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s: %s"', $response->status, $response->error->type, $response->error->reason));
         }
     }
 

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

@@ -583,27 +583,15 @@ public function removeOldIndices()
 
         $currentlyLiveIndices = array_keys($this->searchClient->request('GET', '/_alias/' . $aliasName)->getTreatedContent());
 
-        $indexStatus = $this->searchClient->request('GET', '/_status')->getTreatedContent();
-        $allIndices = array_keys($indexStatus['indices']);
+        $indexMappings = $this->searchClient->request('GET', '/_all')->getTreatedContent();
+        $allIndices = array_keys($indexMappings);
 
-        $indicesToBeRemoved = [];
-
-        foreach ($allIndices as $indexName) {
-            if (strpos($indexName, $aliasName . '-') !== 0) {
-                // filter out all indices not starting with the alias-name, as they are unrelated to our application
-                continue;
-            }
-
-            if (array_search($indexName, $currentlyLiveIndices) !== false) {
-                // skip the currently live index names from deletion
-                continue;
-            }
-
-            $indicesToBeRemoved[] = $indexName;
-        }
+        $indicesToBeRemoved = array_filter($allIndices, function ($indexName) use ($aliasName, $currentlyLiveIndices) {
+            return strpos($indexName, $aliasName . '-') === 0 && array_search($indexName, $currentlyLiveIndices) === false;
+        });
 
         if (count($indicesToBeRemoved) > 0) {
-            $this->searchClient->request('DELETE', '/' . implode(',', $indicesToBeRemoved) . '/');
+            $this->searchClient->request('DELETE', '/' . implode(',', $indicesToBeRemoved));
         }
 
         return $indicesToBeRemoved;