ACP2E-1875: [Magento Cloud] Products incorrectly showed Out of Stock then all products show in stock

- stacked indexer actions

Author: aplapana

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

@@ -13,7 +13,6 @@
 use Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\DimensionProviderInterface;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Store\Model\StoreDimensionProvider;
 use Magento\Indexer\Model\ProcessManager;
 use Magento\Framework\App\DeploymentConfig;
@@ -102,6 +101,11 @@ class Fulltext implements
      */
     private $deploymentConfig;
 
+    /**
+     * @var EnhancedIndexerHandler
+     */
+    private $enhancedIndexerHandler;
+
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
@@ -140,6 +144,8 @@ public function __construct(
         $this->processManager = $processManager ?: ObjectManager::getInstance()->get(ProcessManager::class);
         $this->batchSize = $batchSize ?? self::BATCH_SIZE;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->enhancedIndexerHandler = $enhancedIndexerHandler ?:
+            ObjectManager::getInstance()->create(EnhancedIndexerHandler::class, ['data' => $this->data]);
     }
 
     /**
@@ -173,12 +179,6 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
                 'data' => $this->data,
             ]
         );
-        $enhancedIndexerHandler = $this->indexerHandlerFactory->createSpecificHandler(
-            [
-                'data' => $this->data,
-            ],
-            EnhancedIndexerHandler::class
-        );
 
         if (null === $entityIds) {
             $saveHandler->cleanIndex($dimensions);
@@ -198,13 +198,13 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
             foreach ($entityIds as $entityId) {
                 $currentBatch[] = $entityId;
                 if (++$i === $this->batchSize) {
-                    $this->processBatch($enhancedIndexerHandler, $dimensions, $currentBatch);
+                    $this->processBatch($this->enhancedIndexerHandler, $dimensions, $currentBatch);
                     $i = 0;
                     $currentBatch = [];
                 }
             }
             if (!empty($currentBatch)) {
-                $this->processBatch($enhancedIndexerHandler, $dimensions, $currentBatch);
+                $this->processBatch($this->enhancedIndexerHandler, $dimensions, $currentBatch);
             }
         }
     }

app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php

@@ -53,35 +53,6 @@ public function __construct(
         $this->engineResolver = $engineResolver;
     }
 
-    /**
-     * Creates specific indexer handler
-     *
-     * @param array $data
-     * @param string|null $handler
-     * @return IndexerInterface
-     */
-    public function createSpecificHandler(array $data = [], ?string $handler = null): IndexerInterface
-    {
-        if (!$handler) {
-            return $this->create($data);
-        }
-        $indexer = $this->_objectManager->create($handler, $data);
-
-        $currentHandler = $this->engineResolver->getCurrentSearchEngine();
-        if (!$indexer instanceof IndexerInterface) {
-            throw new \InvalidArgumentException(
-                $currentHandler . ' indexer handler doesn\'t implement ' . IndexerInterface::class
-            );
-        }
-
-        if ($indexer && !$indexer->isAvailable()) {
-            throw new \LogicException(
-                'Indexer handler is not available: ' . $currentHandler
-            );
-        }
-        return $indexer;
-    }
-
     /**
      * Create indexer handler
      *

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php

@@ -74,10 +74,9 @@ protected function setUp(): void
         $this->enhancedSaveHandler = $this->getClassMock(EnhancedIndexerHandler::class);
         $indexerHandlerFactory = $this->createPartialMock(
             IndexerHandlerFactory::class,
-            ['create', 'createSpecificHandler']
+            ['create']
         );
         $indexerHandlerFactory->expects($this->any())->method('create')->willReturn($this->saveHandler);
-        $indexerHandlerFactory->expects($this->any())->method('createSpecificHandler')->willReturn($this->enhancedSaveHandler);
 
         $this->fulltextResource = $this->getClassMock(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class);
 
@@ -101,6 +100,7 @@ protected function setUp(): void
                 'dimensionProvider' => $this->dimensionProviderMock,
                 'indexScopeState' => $stateMock,
                 'processManager' => $this->processManager,
+                'enhancedIndexerHandler' => $this->enhancedSaveHandler
             ]
         );
     }

app/code/Magento/Elasticsearch/Model/Indexer/EnhancedIndexerHandler.php

@@ -23,6 +23,11 @@ class EnhancedIndexerHandler extends IndexerHandler
      */
     private ElasticsearchAdapter $adapter;
 
+    /**
+     * @var array
+     */
+    private array $data = [];
+
     /**
      * IndexerHandler constructor.
      * @param IndexStructureInterface $indexStructure