MC-38168: Manual Indexer after Merchandising - Empty Catalog/ Number of products incorrect

Author: o-iegorov

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

@@ -13,6 +13,7 @@
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
 
 /**
  * Indexer model.
@@ -66,6 +67,11 @@ class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
      */
     private $workingStateProvider;
 
+    /**
+     * @var IndexerInterfaceFactory
+     */
+    private $indexerFactory;
+
     /**
      * @param ConfigInterface $config
      * @param ActionFactory $actionFactory
@@ -74,6 +80,7 @@ class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
      * @param Indexer\StateFactory $stateFactory
      * @param Indexer\CollectionFactory $indexersFactory
      * @param WorkingStateProvider $workingStateProvider
+     * @param IndexerInterfaceFactory $indexerFactory
      * @param array $data
      */
     public function __construct(
@@ -84,6 +91,7 @@ public function __construct(
         Indexer\StateFactory $stateFactory,
         Indexer\CollectionFactory $indexersFactory,
         WorkingStateProvider $workingStateProvider,
+        IndexerInterfaceFactory $indexerFactory,
         array $data = []
     ) {
         $this->config = $config;
@@ -93,6 +101,7 @@ public function __construct(
         $this->stateFactory = $stateFactory;
         $this->indexersFactory = $indexersFactory;
         $this->workingStateProvider = $workingStateProvider;
+        $this->indexerFactory = $indexerFactory;
         parent::__construct($data);
     }
 
@@ -465,7 +474,7 @@ private function getSharedIndexers(string $sharedIndex) : array
             }
             $indexerConfig = $this->config->getIndexer($indexerId);
             if ($indexerConfig['shared_index'] === $sharedIndex) {
-                $indexer = $this->indexersFactory->create();
+                $indexer = $this->indexerFactory->create();
                 $indexer->load($indexerId);
                 $result[] = $indexer;
             }