MAGETWO-93669: [Forwardport] Implement parallelization for Category Product Indexer

Author: slopukhov

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

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Indexer\Model;
 
 /**
@@ -107,7 +109,7 @@ private function multiThreadsExecute($userFunctions)
      *
      * @return bool
      */
-    private function isCanBeParalleled()
+    private function isCanBeParalleled(): bool
     {
         return function_exists('pcntl_fork');
     }
@@ -117,7 +119,7 @@ private function isCanBeParalleled()
      *
      * @return bool
      */
-    private function isSetupMode()
+    private function isSetupMode(): bool
     {
         return $this->registry->registry('setup-mode-enabled') ?: false;
     }
@@ -128,7 +130,7 @@ private function isSetupMode()
      * @param callable $userFunction
      * @SuppressWarnings(PHPMD.ExitExpression)
      */
-    private function startChildProcess($userFunction)
+    private function startChildProcess(callable $userFunction)
     {
         $status = call_user_func($userFunction);
         $status = is_integer($status) ? $status : 0;
@@ -140,7 +142,7 @@ private function startChildProcess($userFunction)
      *
      * @param int $threadNumber
      */
-    private function executeParentProcess(&$threadNumber)
+    private function executeParentProcess(int &$threadNumber)
     {
         $threadNumber++;
         if ($threadNumber >= $this->threadsCount) {

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

@@ -42,7 +42,11 @@
         <plugin name="page-cache-indexer-reindex-clean-cache"
                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
     </type>
-
+    <type name="\Magento\Indexer\Model\ProcessManager">
+        <arguments>
+            <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">

lib/internal/Magento/Framework/App/ResourceConnection.php

@@ -104,9 +104,21 @@ public function getConnection($resourceName = self::DEFAULT_CONNECTION)
      */
     public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
     {
-        $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
-        if (isset($this->connections[$processConnectionName])) {
-            $this->connections[$processConnectionName] = null;
+        if ($resourceName === null) {
+            foreach ($this->connections as $processConnection) {
+                if ($processConnection !== null) {
+                    $processConnection->closeConnection();
+                }
+            }
+            $this->connections = [];
+        } else {
+            $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
+            if (isset($this->connections[$processConnectionName])) {
+                if ($this->connections[$processConnectionName] !== null) {
+                    $this->connections[$processConnectionName]->closeConnection();
+                }
+                $this->connections[$processConnectionName] = null;
+            }
         }
     }
 

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -316,6 +316,7 @@ public function testInstall()
         $appState->expects($this->once())
             ->method('setAreaCode')
             ->with(\Magento\Framework\App\Area::AREA_GLOBAL);
+        $registry = $this->createMock(\Magento\Framework\Registry::class);
         $this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
         $this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
         $this->objectManager->expects($this->any())
@@ -346,7 +347,8 @@ public function testInstall()
             ->will($this->returnValueMap([
                 [\Magento\Framework\App\State::class, $appState],
                 [\Magento\Framework\App\Cache\Manager::class, $cacheManager],
-                [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock]
+                [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock],
+                [\Magento\Framework\Registry::class, $registry]
             ]));
         $this->adminFactory->expects($this->once())->method('create')->willReturn(
             $this->createMock(\Magento\Setup\Model\AdminAccount::class)