MAGETWO-93319: Parallelization update

Author: slopukhov

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

@@ -15,47 +15,36 @@ 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 $threadsCountFromEnvVariable;
+    private $threadsCount;
 
     /**
      * @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,
-        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
         \Magento\Framework\Registry $registry = null,
         int $threadsCount = null
     ) {
         $this->resource = $resource;
-        $this->deploymentConfig = $deploymentConfig;
         if (null === $registry) {
             $registry = \Magento\Framework\App\ObjectManager::getInstance()->get(
                 \Magento\Framework\Registry::class
             );
         }
         $this->registry = $registry;
-        $this->threadsCountFromEnvVariable = $threadsCount;
+        $this->threadsCount = $threadsCount;
     }
 
     /**
@@ -65,7 +54,7 @@ public function __construct(
      */
     public function execute($userFunctions)
     {
-        if ($this->getThreadsCount() > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
+        if ($this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
             $this->multiThreadsExecute($userFunctions);
         } else {
             $this->simpleThreadExecute($userFunctions);
@@ -123,22 +112,6 @@ 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
      *
@@ -170,7 +143,7 @@ private function startChildProcess($userFunction)
     private function executeParentProcess(&$threadNumber)
     {
         $threadNumber++;
-        if ($threadNumber >= $this->getThreadsCount()) {
+        if ($threadNumber >= $this->threadsCount) {
             pcntl_wait($status);
             if (pcntl_wexitstatus($status) !== 0) {
                 $this->failInChildProcess = true;