B2B-1832: Error when reindex Catalog Search index during the snapshot of elasticsearch

Author: Roman Hanin

app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php

@@ -239,12 +239,23 @@ public function cleanIndex($storeId, $mappedIndexerId)
         // prepare new index name and increase version
         $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId);
         $version = (int)(str_replace($indexPattern, '', $indexName));
-        $newIndexName = $indexPattern . (++$version);
 
-        // remove index if already exists
-        if ($this->client->indexExists($newIndexName)) {
+        // compatibility with snapshotting collision
+        $deleteQueue = [];
+        do {
+            $newIndexName = $indexPattern . (++$version);
+            if ($this->client->indexExists($newIndexName)) {
+                $deleteQueue []= $newIndexName;
+                $indexExists = true;
+            } else {
+                $indexExists = false;
+            }
+        } while ($indexExists);
+
+        foreach ($deleteQueue as $indexToDelete) {
+            // remove index if already exists
             try {
-                $this->client->deleteIndex($newIndexName);
+                $this->client->deleteIndex($indexToDelete);
             } catch (\Exception $e) {
                 $this->logger->critical($e);
             }