Merge branch 'MAGETWO-84646' of https://github.com/magento-tango/magento2ce into 2.2.2-develop-PR

Author: Oleksandr Iegorov

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

@@ -75,7 +75,8 @@ public function trySetJobUniqueStatusAtomic($scheduleId, $newStatus, $currentSta
             )
             ->where('current.schedule_id = ?', $scheduleId)
             ->where('current.status = ?', $currentStatus)
-            ->where('existing.schedule_id IS NULL');
+            ->where('existing.schedule_id IS NULL')
+            ->where('existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY'); //hotfix
 
         $update = $connection->updateFromSelect($selectIfUnlocked, ['current' => $this->getTable('cron_schedule')]);
         $result = $connection->query($update)->rowCount();

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

@@ -0,0 +1,52 @@
+<?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;
+
+/**
+ * @codeCoverageIgnore
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+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)
+        );
+    }
+}