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

 - Merge Pull Request #24552 from VaD1ke/magento2:fix__elastic-alias-doubled-index_develop
 - Merged commits:
   1. 320aac0
   2. fcc38ef

Author: magento-engcom-team

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);
         if ($this->client->isEmptyIndex($indexName)) {
@@ -203,7 +206,7 @@ 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;
+        $newIndexName = $indexPattern . (++$version);
 
         // remove index if already exists
         if ($this->client->indexExists($newIndexName)) {
@@ -354,12 +357,14 @@ protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
     {
         $this->indexBuilder->setStoreId($storeId);
         $settings = $this->indexBuilder->build();
-        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
-            'entityType' => $mappedIndexerId,
-            // Use store id instead of website id from context for save existing fields mapping.
-            // In future websiteId will be eliminated due to index stored per store
-            'websiteId' => $storeId
-        ]);
+        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes(
+            [
+                'entityType' => $mappedIndexerId,
+                // Use store id instead of website id from context for save existing fields mapping.
+                // In future websiteId will be eliminated due to index stored per store
+                'websiteId' => $storeId
+            ]
+        );
         $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
         $this->client->createIndex($indexName, ['settings' => $settings]);
         $this->client->addFieldsMapping(