MAGECLOUD-1739: Consider Removing Per-node Hook Functionality (#246)

bin/ece-tools

@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$container = require_once __DIR__ . '/../bootstrap.php';
+$container = require __DIR__ . '/../bootstrap.php';
 
 $application = new \Magento\MagentoCloud\Application($container);
 $application->run();

src/App/Container.php

@@ -9,7 +9,6 @@
 use Magento\MagentoCloud\Command\DbDump;
 use Magento\MagentoCloud\Command\Deploy;
 use Magento\MagentoCloud\Command\ConfigDump;
-use Magento\MagentoCloud\Command\Prestart;
 use Magento\MagentoCloud\Command\PostDeploy;
 use Magento\MagentoCloud\Config\ValidatorInterface;
 use Magento\MagentoCloud\Config\Validator as ConfigValidator;
@@ -26,10 +25,8 @@
 use Magento\MagentoCloud\Process\DbDump as DbDumpProcess;
 use Magento\MagentoCloud\Process\Deploy as DeployProcess;
 use Magento\MagentoCloud\Process\ConfigDump as ConfigDumpProcess;
-use Magento\MagentoCloud\Process\Prestart as PrestartProcess;
 use Magento\MagentoCloud\Process\PostDeploy as PostDeployProcess;
 use Psr\Container\ContainerInterface;
-use Magento\MagentoCloud\Process;
 
 /**
  * @inheritdoc
@@ -88,7 +85,6 @@ function () {
                 return new Flag\Pool([
                     Flag\Manager::FLAG_REGENERATE => 'var/.regenerate',
                     Flag\Manager::FLAG_STATIC_CONTENT_DEPLOY_IN_BUILD => '.static_content_deploy',
-                    Flag\Manager::FLAG_STATIC_CONTENT_DEPLOY_PENDING => 'var/.static_content_deploy_pending',
                     Flag\Manager::FLAG_DEPLOY_HOOK_IS_FAILED => 'var/.deploy_is_failed',
                 ]);
             }
@@ -280,16 +276,6 @@ function () {
         $this->container->when(DeployProcess\InstallUpdate\ConfigUpdate\DbConnection::class)
             ->needs(ConnectionInterface::class)
             ->give(ReadConnection::class);
-        $this->container->when(Prestart::class)
-            ->needs(ProcessInterface::class)
-            ->give(function () {
-                return $this->container->makeWith(ProcessComposite::class, [
-                    'processes' => [
-                        $this->container->make(PrestartProcess\DeployStaticContent::class),
-                        $this->container->make(PrestartProcess\CompressStaticContent::class),
-                    ],
-                ]);
-            });
         $this->container->when(DeployProcess\InstallUpdate\ConfigUpdate\Urls::class)
             ->needs(ProcessInterface::class)
             ->give(function () {
@@ -342,15 +328,6 @@ function () {
                     ],
                 ]);
             });
-        $this->container->when(PrestartProcess\DeployStaticContent::class)
-            ->needs(ProcessInterface::class)
-            ->give(function () {
-                return $this->container->makeWith(ProcessComposite::class, [
-                    'processes' => [
-                        $this->get(PrestartProcess\DeployStaticContent\Generate::class),
-                    ],
-                ]);
-            });
         $this->container->when(DbDump::class)
             ->needs(ProcessInterface::class)
             ->give(function () {

src/Application.php

@@ -53,7 +53,6 @@ protected function getDefaultCommands()
                 $this->container->get(Command\Build::class),
                 $this->container->get(Command\Deploy::class),
                 $this->container->get(Command\ConfigDump::class),
-                $this->container->get(Command\Prestart::class),
                 $this->container->get(Command\DbDump::class),
                 $this->container->get(Command\PostDeploy::class),
                 $this->container->get(Command\CronUnlock::class),

src/Filesystem/Flag/Manager.php

@@ -26,11 +26,6 @@ class Manager
      */
     const FLAG_STATIC_CONTENT_DEPLOY_IN_BUILD = 'scd_in_build';
 
-    /**
-     * Used for postponing static content deployment until prestart phase.
-     */
-    const FLAG_STATIC_CONTENT_DEPLOY_PENDING = 'scd_pending';
-
     /**
      * Used to mark that deploy hook is failed.
      */

src/Process/Deploy/CompressStaticContent.php

@@ -88,10 +88,6 @@ public function execute()
         if (!$this->stageConfig->get(DeployInterface::VAR_SKIP_SCD)
             && $this->environment->isDeployStaticContent()
         ) {
-            if ($this->flagManager->exists(FlagManager::FLAG_STATIC_CONTENT_DEPLOY_PENDING)) {
-                $this->logger->info('Postpone static content compression until prestart');
-                return;
-            }
             $this->staticContentCompressor->process(
                 $this->stageConfig->get(DeployInterface::VAR_SCD_COMPRESSION_LEVEL),
                 $this->stageConfig->get(DeployInterface::VAR_VERBOSE_COMMANDS)

src/Process/Deploy/DeployStaticContent.php

@@ -8,9 +8,7 @@
 use Magento\MagentoCloud\Config\Environment;
 use Magento\MagentoCloud\Config\GlobalSection as GlobalConfig;
 use Magento\MagentoCloud\Config\Stage\DeployInterface;
-use Magento\MagentoCloud\Filesystem\Flag\Manager as FlagManager;
 use Magento\MagentoCloud\Process\ProcessInterface;
-use Magento\MagentoCloud\Util\RemoteDiskIdentifier;
 use Psr\Log\LoggerInterface;
 use Magento\MagentoCloud\Util\StaticContentCleaner;
 
@@ -34,16 +32,6 @@ class DeployStaticContent implements ProcessInterface
      */
     private $logger;
 
-    /**
-     * @var RemoteDiskIdentifier
-     */
-    private $remoteDiskIdentifier;
-
-    /**
-     * @var FlagManager
-     */
-    private $flagManager;
-
     /**
      * @var DeployInterface
      */
@@ -63,8 +51,6 @@ class DeployStaticContent implements ProcessInterface
      * @param ProcessInterface $process
      * @param Environment $environment
      * @param LoggerInterface $logger
-     * @param RemoteDiskIdentifier $remoteDiskIdentifier
-     * @param FlagManager $flagManager
      * @param DeployInterface $stageConfig
      * @param GlobalConfig $globalConfig
      * @param StaticContentCleaner $staticContentCleaner
@@ -73,17 +59,13 @@ public function __construct(
         ProcessInterface $process,
         Environment $environment,
         LoggerInterface $logger,
-        RemoteDiskIdentifier $remoteDiskIdentifier,
-        FlagManager $flagManager,
         DeployInterface $stageConfig,
         GlobalConfig $globalConfig,
         StaticContentCleaner $staticContentCleaner
     ) {
         $this->process = $process;
         $this->environment = $environment;
         $this->logger = $logger;
-        $this->remoteDiskIdentifier = $remoteDiskIdentifier;
-        $this->flagManager = $flagManager;
         $this->stageConfig = $stageConfig;
         $this->globalConfig = $globalConfig;
         $this->staticContentCleaner = $staticContentCleaner;
@@ -98,24 +80,13 @@ public function __construct(
      */
     public function execute()
     {
-        $this->flagManager->delete(FlagManager::FLAG_STATIC_CONTENT_DEPLOY_PENDING);
-
         if ($this->globalConfig->get(DeployInterface::VAR_SCD_ON_DEMAND)) {
             $this->logger->notice('Skipping static content deploy. SCD on demand is enabled.');
             $this->staticContentCleaner->clean();
 
             return;
         }
 
-        if ($this->remoteDiskIdentifier->isOnLocalDisk('pub/static')
-            && !$this->flagManager->exists(FlagManager::FLAG_STATIC_CONTENT_DEPLOY_IN_BUILD)
-        ) {
-            $this->flagManager->set(FlagManager::FLAG_STATIC_CONTENT_DEPLOY_PENDING);
-            $this->logger->info('Postpone static content deployment until prestart');
-
-            return;
-        }
-
         if ($this->stageConfig->get(DeployInterface::VAR_SKIP_SCD)
             || !$this->environment->isDeployStaticContent()
         ) {