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

- implemented CR

Author: aplapana

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

@@ -12,7 +12,7 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\DimensionProviderInterface;
-use Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface;
+use Magento\Framework\Indexer\SaveHandler\StackedActionsIndexerInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Store\Model\StoreDimensionProvider;
 use Magento\Indexer\Model\ProcessManager;
@@ -220,12 +220,18 @@ private function processBatch(
         );
 
         if ($saveHandler->isAvailable($dimensions)) {
-            if (in_array(EnhancedIndexerInterface::class, class_implements($saveHandler))) {
-                $saveHandler->enableStackedActions();
-                $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
-                $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
-                $saveHandler->triggerStackedActions();
-                $saveHandler->disableStackedActions();
+            if (in_array(StackedActionsIndexerInterface::class, class_implements($saveHandler))) {
+                try {
+                    $saveHandler->enableStackedActions();
+                    $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
+                    $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
+                    $saveHandler->triggerStackedActions();
+                    $saveHandler->disableStackedActions();
+                } catch (\Throwable $exception) {
+                    $saveHandler->disableStackedActions();
+                    $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
+                    $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
+                }
             } else {
                 $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
                 $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));

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

@@ -15,7 +15,7 @@
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
-use Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface;
+use Magento\Framework\Indexer\SaveHandler\StackedActionsIndexerInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Indexer\CacheContext;
@@ -24,7 +24,7 @@
  * Indexer Handler for Elasticsearch engine.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class IndexerHandler implements IndexerInterface, EnhancedIndexerInterface
+class IndexerHandler implements IndexerInterface, StackedActionsIndexerInterface
 {
     /**
      * Size of default batch

lib/internal/Magento/Framework/Indexer/SaveHandler/EnhancedIndexerInterface.php renamed to lib/internal/Magento/Framework/Indexer/SaveHandler/StackedActionsIndexerInterface.php

@@ -7,7 +7,7 @@
 
 namespace Magento\Framework\Indexer\SaveHandler;
 
-interface EnhancedIndexerInterface
+interface StackedActionsIndexerInterface
 {
     /**
      * Disable stacked queries mode