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

@@ -10,6 +10,7 @@
 use Magento\CatalogSearch\Model\Indexer\Scope\State;
 use Magento\CatalogSearch\Model\Indexer\Scope\StateFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
+use Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\DimensionProviderInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
@@ -40,6 +41,13 @@ class Fulltext implements
      */
     private const BATCH_SIZE = 1000;
 
+    /**
+     * Deployment config path
+     *
+     * @var string
+     */
+    private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
+
     /**
      * @var array index structure
      */
@@ -94,13 +102,6 @@ class Fulltext implements
      */
     private $deploymentConfig;
 
-    /**
-     * Deployment config path
-     *
-     * @var string
-     */
-    private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
-
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
@@ -112,6 +113,7 @@ class Fulltext implements
      * @param ProcessManager|null $processManager
      * @param int|null $batchSize
      * @param DeploymentConfig|null $deploymentConfig
+     * @param EnhancedIndexerHandler|null $enhancedIndexerHandler
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -156,7 +158,7 @@ public function execute($entityIds)
     /**
      * @inheritdoc
      *
-     * @throws \InvalidArgumentException
+     * @throws \InvalidArgumentException|\Exception
      * @since 101.0.0
      */
     public function executeByDimensions(array $dimensions, \Traversable $entityIds = null)
@@ -203,12 +205,13 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
     /**
      * Process batch
      *
-     * @param IndexerInterface $saveHandler
+     * @param EnhancedIndexerHandler $saveHandler
      * @param array $dimensions
      * @param array $entityIds
+     * @throws \Exception
      */
     private function processBatch(
-        IndexerInterface $saveHandler,
+        EnhancedIndexerHandler $saveHandler,
         array $dimensions,
         array $entityIds
     ) : void {
@@ -217,8 +220,11 @@ private function processBatch(
             array_merge($entityIds, $this->fulltextResource->getRelationsByChild($entityIds))
         );
         if ($saveHandler->isAvailable($dimensions)) {
+            $saveHandler->enableStackedActions();
             $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
             $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
+            $saveHandler->triggerStackedActions();
+            $saveHandler->disableStackedActions();
         }
     }
 

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

@@ -124,6 +124,16 @@ class Elasticsearch
         'elasticsearchMissing404' => Missing404Exception::class
     ];
 
+    /**
+     * @var bool
+     */
+    private bool $isStackQueries = false;
+
+    /**
+     * @var array
+     */
+    private array $stackedQueries = [];
+
     /**
      * @param ConnectionManager $connectionManager
      * @param FieldMapperInterface $fieldMapper
@@ -182,6 +192,59 @@ public function __construct(
         }
     }
 
+    /**
+     * @return void
+     */
+    public function disableStackQueriesMode(): void
+    {
+        $this->stackedQueries = [];
+        $this->isStackQueries = false;
+    }
+
+    /**
+     * @return void
+     */
+    public function enableStackQueriesMode(): void
+    {
+        $this->isStackQueries = true;
+    }
+
+    /**
+     * @return $this
+     * @throws Exception
+     */
+    public function triggerStackedQueries(): self
+    {
+        try {
+            if (!empty($this->stackedQueries)) {
+                $this->client->bulkQuery($this->stackedQueries);
+            }
+        } catch (Exception $e) {
+            $this->logger->critical($e);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param array $queries
+     * @return void
+     * @throws LocalizedException
+     */
+    protected function stackQueries(array $queries): void
+    {
+        if ($this->isStackQueries) {
+            if (empty($this->stackedQueries)) {
+                $this->stackedQueries = $queries;
+            } else {
+                $this->stackedQueries['body'] = array_merge($this->stackedQueries['body'], $queries['body']);
+            }
+        } else {
+            throw new LocalizedException(__('Stacked indexer queries not enabled'));
+        }
+    }
+
     /**
      * Retrieve Elasticsearch server status
      *
@@ -234,7 +297,11 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId)
             try {
                 $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
                 $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName);
-                $this->client->bulkQuery($bulkIndexDocuments);
+                if ($this->isStackQueries === false) {
+                    $this->client->bulkQuery($bulkIndexDocuments);
+                } else {
+                    $this->stackQueries($bulkIndexDocuments);
+                }
             } catch (Exception $e) {
                 $this->logger->critical($e);
                 throw $e;
@@ -309,7 +376,11 @@ public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId)
                 $indexName,
                 self::BULK_ACTION_DELETE
             );
-            $this->client->bulkQuery($bulkDeleteDocuments);
+            if ($this->isStackQueries === false) {
+                $this->client->bulkQuery($bulkDeleteDocuments);
+            } else {
+                $this->stackQueries($bulkDeleteDocuments);
+            }
         } catch (Exception $e) {
             $this->logger->critical($e);
             throw $e;

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace Magento\Elasticsearch\Model\Indexer;
+
+class EnhancedIndexerHandler extends IndexerHandler
+{
+    /**
+     * Disables stacked actions mode
+     *
+     * @return void
+     */
+    public function disableStackedActions(): void
+    {
+        $this->adapter->disableStackQueriesMode();
+    }
+
+    /**
+     * Enables stacked actions mode
+     *
+     * @return void
+     */
+    public function enableStackedActions(): void
+    {
+        $this->adapter->enableStackQueriesMode();
+    }
+
+    /**
+     * Runs stacked actions
+     *
+     * @return void
+     * @throws \Exception
+     */
+    public function triggerStackedActions(): void
+    {
+        $this->adapter->triggerStackedQueries();
+    }
+}

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

@@ -37,7 +37,7 @@ class IndexerHandler implements IndexerInterface
     /**
      * @var ElasticsearchAdapter
      */
-    private $adapter;
+    protected $adapter;
 
     /**
      * @var IndexNameResolver

app/code/Magento/Elasticsearch/etc/di.xml

@@ -205,7 +205,7 @@
     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Elasticsearch/i18n/en_US.csv

@@ -12,3 +12,4 @@
 "Test Connection","Test Connection"
 "Minimum Terms to Match","Minimum Terms to Match"
 "Created indexer handler must be instance of %1.", "Created indexer handler must be instance of %1."
+"Stacked indexer queries not enabled", "Stacked indexer queries not enabled"

app/code/Magento/Elasticsearch7/etc/di.xml

@@ -51,7 +51,7 @@
     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="elasticsearch7" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
+                <item name="elasticsearch7" xsi:type="string">Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/OpenSearch/etc/di.xml

@@ -90,7 +90,7 @@
     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="opensearch" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
+                <item name="opensearch" xsi:type="string">Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler</item>
             </argument>
         </arguments>
     </type>