Disable cron:run when maintenance mode is enabled

app/code/Magento/Cron/Console/Command/CronCommand.php

@@ -10,6 +10,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Store\Model\Store;
@@ -43,18 +44,30 @@ class CronCommand extends Command
      */
     private $deploymentConfig;
 
+    /**
+     * Maintenance mode
+     *
+     * @var MaintenanceMode
+     */
+    private $maintenanceMode;
+
     /**
      * @param ObjectManagerFactory $objectManagerFactory
      * @param DeploymentConfig $deploymentConfig Application deployment configuration
+     * @param MaintenanceMode $maintenanceMode
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
-        DeploymentConfig $deploymentConfig = null
+        DeploymentConfig $deploymentConfig = null,
+        MaintenanceMode $maintenanceMode = null
     ) {
         $this->objectManagerFactory = $objectManagerFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(
             DeploymentConfig::class
         );
+        $this->maintenanceMode = $maintenanceMode ?: ObjectManager::getInstance()->get(
+            MaintenanceMode::class
+        );
         parent::__construct();
     }
 
@@ -90,6 +103,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if ($this->maintenanceMode->isOn()) {
+            $output->writeln('<info>' . 'Cron is disabled because the maintenance mode is enabled.' . '</info>');
+            return;
+        }
         if (!$this->deploymentConfig->get('cron/enabled', 1)) {
             $output->writeln('<info>' . 'Cron is disabled. Jobs were not run.' . '</info>');
             return;

app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Cron\Console\Command\CronCommand;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\ObjectManagerFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -23,10 +24,16 @@ class CronCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @var MaintenanceMode|MockObject
+     */
+    private $maintenanceModeMock;
+
     protected function setUp()
     {
         $this->objectManagerFactory = $this->createMock(ObjectManagerFactory::class);
         $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->maintenanceModeMock = $this->createMock(MaintenanceMode::class);
     }
 
     /**
@@ -36,14 +43,17 @@ protected function setUp()
      */
     public function testExecuteWithDisabledCrons()
     {
+        $this->maintenanceModeMock->expects($this->once())
+            ->method('isOn')
+            ->willReturn(false);
         $this->objectManagerFactory->expects($this->never())
             ->method('create');
         $this->deploymentConfigMock->expects($this->once())
             ->method('get')
             ->with('cron/enabled', 1)
             ->willReturn(0);
         $commandTester = new CommandTester(
-            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock, $this->maintenanceModeMock)
         );
         $commandTester->execute([]);
         $expectedMsg = 'Cron is disabled. Jobs were not run.' . PHP_EOL;
@@ -64,6 +74,9 @@ public function testExecute()
             ->willReturn($cron);
         $cron->expects($this->once())
             ->method('launch');
+        $this->maintenanceModeMock->expects($this->once())
+            ->method('isOn')
+            ->willReturn(false);
         $this->objectManagerFactory->expects($this->once())
             ->method('create')
             ->willReturn($objectManager);
@@ -72,10 +85,32 @@ public function testExecute()
             ->with('cron/enabled', 1)
             ->willReturn(1);
         $commandTester = new CommandTester(
-            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock, $this->maintenanceModeMock)
         );
         $commandTester->execute([]);
         $expectedMsg = 'Ran jobs by schedule.' . PHP_EOL;
         $this->assertEquals($expectedMsg, $commandTester->getDisplay());
     }
+
+    /**
+     * Test command with maintenance mode enabled
+     *
+     * @return void
+     */
+    public function testWithMaintenanceModeEnabled()
+    {
+        $this->maintenanceModeMock->expects($this->once())
+            ->method('isOn')
+            ->willReturn(true);
+        $this->objectManagerFactory->expects($this->never())
+            ->method('create');
+        $this->deploymentConfigMock->expects($this->never())
+            ->method('get');
+        $commandTester = new CommandTester(
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock, $this->maintenanceModeMock)
+        );
+        $commandTester->execute([]);
+        $expectedMsg = 'Cron is disabled because the maintenance mode is enabled.' . PHP_EOL;
+        $this->assertEquals($expectedMsg, $commandTester->getDisplay());
+    }
 }