Merge pull request #6909 from magento-arcticfoxes/B2B-1832

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

Author: rganin

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

@@ -239,11 +239,26 @@ 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)) {
-            $this->client->deleteIndex($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, wildcard deletion may cause collisions
+            try {
+                $this->client->deleteIndex($indexToDelete);
+            } catch (\Exception $e) {
+                $this->logger->critical($e);
+            }
         }
 
         // prepare new index
@@ -372,7 +387,11 @@ public function updateAlias($storeId, $mappedIndexerId)
 
         // remove obsolete index
         if ($oldIndex) {
-            $this->client->deleteIndex($oldIndex);
+            try {
+                $this->client->deleteIndex($oldIndex);
+            } catch (\Exception $e) {
+                $this->logger->critical($e);
+            }
             unset($this->indexByCode[$mappedIndexerId . '_' . $storeId]);
         }
 

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php

@@ -336,15 +336,23 @@ public function testCleanIndex()
     {
         $this->indexNameResolver->expects($this->any())
             ->method('getIndexName')
-            ->with(1, 'product', [])
-            ->willReturn('indexName_product_1_v');
+            ->willReturnMap([[1, 'product', [1 => null], '_product_1_v0']]);
 
         $this->client->expects($this->atLeastOnce())
             ->method('indexExists')
-            ->willReturn(true);
-        $this->client->expects($this->once())
+            ->willReturnMap(
+                [
+                    ['_product_1_v1', true],
+                    ['_product_1_v2', true],
+                    ['_product_1_v3', false],
+                ]
+            );
+        $this->client->expects($this->exactly(2))
             ->method('deleteIndex')
-            ->with('_product_1_v1');
+            ->willReturnMap([
+                ['_product_1_v1'],
+                ['_product_1_v2'],
+            ]);
         $this->assertSame(
             $this->model,
             $this->model->cleanIndex(1, 'product')