ENGCOM-5834: Fix elastic alias doubled index if exception was thrown #24552

VladimirZaets · web-flow · commit e4e1ae382f17 · 2019-11-06T14:48:16.000-06:00
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -193,6 +193,9 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId)
      */
     public function cleanIndex($storeId, $mappedIndexerId)
     {
+        // needed to fix bug with double indices in alias because of second reindex in same process
+        unset($this->preparedIndex[$storeId]);
+
         $this->checkIndex($storeId, $mappedIndexerId, true);
         $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
 

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId)`
`193`	`193`	`*/`
`194`	`194`	`public function cleanIndex($storeId, $mappedIndexerId)`
`195`	`195`	`{`
	`196`	`+ // needed to fix bug with double indices in alias because of second reindex in same process`
	`197`	`+ unset($this->preparedIndex[$storeId]);`
	`198`	`+`
`196`	`199`	`$this->checkIndex($storeId, $mappedIndexerId, true);`
`197`	`200`	`$indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);`
`198`	`201`