MC-25132 Fix deadlocks related to crons / consumers

Author: BaDos

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -567,7 +567,7 @@ private function cleanupJobs($groupId, $currentTime)
                 [
                     'status = ?' => $status,
                     'job_code in (?)' => array_keys($jobs),
-                    'created_at < ?' => $this->_scheduleFactory
+                    'scheduled_at < ?' => $this->_scheduleFactory
                         ->create()
                         ->getResource()
                         ->getConnection()

app/code/Magento/Cron/Test/Unit/Model/DeadlockRetrierTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\DeadlockException;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DeadlockRetrierTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,12 +23,12 @@ class DeadlockRetrierTest extends \PHPUnit\Framework\TestCase
     private $retrier;
 
     /**
-     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterInterface|MockObject
      */
     private $adapterMock;
 
     /**
-     * @var AbstractModel|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractModel|MockObject
      */
     private $modelMock;
 

app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
@@ -24,22 +25,22 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
     protected $helper;
 
     /**
-     * @var \Magento\Cron\Model\ResourceModel\Schedule|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Cron\Model\ResourceModel\Schedule|MockObject
      */
     protected $resourceJobMock;
 
     /**
-     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TimezoneInterface|MockObject
      */
     private $timezoneConverter;
 
     /**
-     * @var DateTimeFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DateTimeFactory|MockObject
      */
     private $dateTimeFactory;
 
     /**
-     * @var DeadlockRetrierInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DeadlockRetrierInterface|MockObject
      */
     private $retrierMock;
 

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Profiler\Driver\Standard\StatFactory;
 use Magento\Cron\Model\DeadlockRetrierInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
@@ -26,41 +27,41 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
     protected $_observer;
 
     /**
-     * @var \Magento\Framework\App\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\ObjectManager|MockObject
      */
     protected $_objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $_cache;
 
     /**
-     * @var \Magento\Cron\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Cron\Model\Config|MockObject
      */
     protected $_config;
 
     /**
-     * @var \Magento\Cron\Model\ScheduleFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Cron\Model\ScheduleFactory|MockObject
      */
     protected $_scheduleFactory;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject
      */
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\App\Console\Request|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Console\Request|MockObject
      */
     protected $_request;
 
     /**
-     * @var \Magento\Framework\ShellInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\ShellInterface|MockObject
      */
     protected $_shell;
 
-    /** @var \Magento\Cron\Model\ResourceModel\Schedule\Collection|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Cron\Model\ResourceModel\Schedule\Collection|MockObject */
     protected $_collection;
 
     /**
@@ -79,42 +80,42 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
     protected $observer;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Psr\Log\LoggerInterface|MockObject
      */
     protected $loggerMock;
 
     /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\State|MockObject
      */
     protected $appStateMock;
 
     /**
-     * @var \Magento\Framework\Lock\LockManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Lock\LockManagerInterface|MockObject
      */
     private $lockManagerMock;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Event\ManagerInterface|MockObject
      */
     private $eventManager;
 
     /**
-     * @var DeadlockRetrierInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DeadlockRetrierInterface|MockObject
      */
     private $retrierMock;
 
     /**
-     * @var \Magento\Cron\Model\ResourceModel\Schedule|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Cron\Model\ResourceModel\Schedule|MockObject
      */
     protected $scheduleResource;
 
     /**
-     * @var StatFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var StatFactory|MockObject
      */
     private $statFactory;
 
     /**
-     * @var Stat|\PHPUnit_Framework_MockObject_MockObject
+     * @var Stat|MockObject
      */
     private $stat;
 
@@ -647,7 +648,7 @@ public function testDispatchRunJob()
             '__wakeup',
             'getResource',
         ];
-        /** @var \Magento\Cron\Model\Schedule|\PHPUnit_Framework_MockObject_MockObject $schedule */
+        /** @var \Magento\Cron\Model\Schedule|MockObject $schedule */
         $schedule = $this->getMockBuilder(
             \Magento\Cron\Model\Schedule::class
         )->setMethods(