MAGETWO-93319: Parallelization update

Author: slopukhov

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

@@ -15,30 +15,47 @@ class ProcessManager
      */
     const THREADS_COUNT = 'MAGE_INDEXER_THREADS_COUNT';
 
+    /**
+     * Configuration path for threads count
+     */
+    const THREADS_COUNT_CONFIG_PATH = 'indexer/threads_count';
+
     /** @var bool */
     private $failInChildProcess = false;
 
     /** @var \Magento\Framework\App\ResourceConnection */
     private $resource;
 
+    /** @var \Magento\Framework\App\DeploymentConfig */
+    private $deploymentConfig;
+
+    /** @var \Magento\Framework\Registry */
+    private $registry;
+
     /** @var int|null */
-    private $threadsCount;
+    private $threadsCountFromEnvVariable;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param \Magento\Framework\Registry $registry
      * @param int|null $threadsCount
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource = null,
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
+        \Magento\Framework\Registry $registry = null,
         int $threadsCount = null
     ) {
-        if (null === $resource) {
-            $resource = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Framework\App\ResourceConnection::class
+        $this->resource = $resource;
+        $this->deploymentConfig = $deploymentConfig;
+        if (null === $registry) {
+            $registry = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Registry::class
             );
         }
-        $this->resource = $resource;
-        $this->threadsCount = (int)$threadsCount;
+        $this->registry = $registry;
+        $this->threadsCountFromEnvVariable = $threadsCount;
     }
 
     /**
@@ -48,7 +65,7 @@ public function __construct(
      */
     public function execute($userFunctions)
     {
-        if ($this->threadsCount > 1 && $this->isCanBeParalleled()) {
+        if ($this->getThreadsCount() > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
             $this->multiThreadsExecute($userFunctions);
         } else {
             $this->simpleThreadExecute($userFunctions);
@@ -106,6 +123,32 @@ private function isCanBeParalleled()
         return function_exists('pcntl_fork');
     }
 
+    /**
+     * Get threads count
+     *
+     * @return bool
+     */
+    private function getThreadsCount()
+    {
+        if ($this->threadsCountFromEnvVariable !== null) {
+            return (int)$this->threadsCountFromEnvVariable;
+        }
+        if ($this->deploymentConfig->get(self::THREADS_COUNT_CONFIG_PATH) !== null) {
+            return (int)$this->deploymentConfig->get(self::THREADS_COUNT_CONFIG_PATH);
+        }
+        return 1;
+    }
+
+    /**
+     * Is setup mode
+     *
+     * @return bool
+     */
+    private function isSetupMode()
+    {
+        return $this->registry->registry('setup-mode-enabled') ?: false;
+    }
+
     /**
      * Start child process
      *
@@ -127,7 +170,7 @@ private function startChildProcess($userFunction)
     private function executeParentProcess(&$threadNumber)
     {
         $threadNumber++;
-        if ($threadNumber >= $this->threadsCount) {
+        if ($threadNumber >= $this->getThreadsCount()) {
             pcntl_wait($status);
             if (pcntl_wexitstatus($status) !== 0) {
                 $this->failInChildProcess = true;

setup/src/Magento/Setup/Model/Installer.php

@@ -755,16 +755,24 @@ private function setupFlagTable(
      * Installs DB schema
      *
      * @return void
+     * @throws \Exception
      */
     public function installSchema()
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->setupFactory->create();
         $this->setupModuleRegistry($setup);
         $this->setupCoreTables($setup);
         $this->log->log('Schema creation/updates:');
         $this->handleDBSchemaData($setup, 'schema');
+
+        $registry->unregister('setup-mode-enabled');
     }
 
     /**
@@ -775,12 +783,19 @@ public function installSchema()
      */
     public function installDataFixtures()
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->dataSetupFactory->create();
         $this->checkFilePermissionsForDbUpgrade();
         $this->log->log('Data install/update:');
         $this->handleDBSchemaData($setup, 'data');
+
+        $registry->unregister('setup-mode-enabled');
     }
 
     /**