Merge remote-tracking branch 'origin/MAGETWO-88212' into 2.3-PR-develop-1

Author: VladimirZaets

app/code/Magento/Cron/Model/ResourceModel/Schedule.php

@@ -66,7 +66,14 @@ public function trySetJobUniqueStatusAtomic($scheduleId, $newStatus, $currentSta
     {
         $connection = $this->getConnection();
 
-        $match = $connection->quoteInto('existing.job_code = current.job_code AND existing.status = ?', $newStatus);
+        // this condition added to avoid cron jobs locking after incorrect termination of running job
+        $match = $connection->quoteInto(
+            'existing.job_code = current.job_code ' .
+            'AND (existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY OR existing.executed_at IS NULL) ' .
+            'AND existing.status = ?',
+            $newStatus
+        );
+
         $selectIfUnlocked = $connection->select()
             ->joinLeft(
                 ['existing' => $this->getTable('cron_schedule')],

app/code/Magento/Cron/Setup/Recurring.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cron\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Cron recurring setup
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var \Magento\Cron\Model\ResourceModel\Schedule
+     */
+    private $schedule;
+
+    /**
+     * Recurring constructor.
+     * @param \Magento\Cron\Model\ResourceModel\Schedule $schedule
+     */
+    public function __construct(
+        \Magento\Cron\Model\ResourceModel\Schedule $schedule
+    ) {
+        $this->schedule = $schedule;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $connection = $this->schedule->getConnection();
+        $connection->update(
+            $this->schedule->getMainTable(),
+            [
+                'status' => \Magento\Cron\Model\Schedule::STATUS_ERROR,
+                'messages' => 'The job is terminated due to system upgrade'
+            ],
+            $connection->quoteInto('status = ?', \Magento\Cron\Model\Schedule::STATUS_RUNNING)
+        );
+    }
+}

dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php

@@ -54,6 +54,27 @@ public function testTryLockJobAlreadyLockedFails()
         $this->assertFalse($schedule->tryLockJob());
     }
 
+    /**
+     * If the job is already locked but lock time less than 1 day ago, attempting to lock it again should fail
+     */
+    public function testTryLockJobAlreadyLockedSucceeds()
+    {
+        $offsetInThePast = 2*24*60*60;
+
+        $oldSchedule = $this->scheduleFactory->create()
+            ->setCronExpr("* * * * *")
+            ->setJobCode("test_job")
+            ->setStatus(Schedule::STATUS_RUNNING)
+            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp() - $offsetInThePast))
+            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 60))
+            ->setExecutedAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 61));
+        $oldSchedule->save();
+
+        $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
+
+        $this->assertTrue($schedule->tryLockJob());
+    }
+
     /**
      * If there's a job already locked, should not be able to lock another job
      */