MAGETWO-83782: [2.2] Cron_schedule forever increasing in size. Lots of pending jobs never cleared

Author: Oleksandr Gorkun

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

@@ -227,7 +227,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     if ($schedule->tryLockJob()) {
                         $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
                     }
-                } catch (\Throwable $e) {
+                } catch (\Exception $e) {
                     $schedule->setMessages($e->getMessage());
                     if ($schedule->getStatus() === Schedule::STATUS_ERROR) {
                         $this->logger->critical($e);
@@ -259,7 +259,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      * @param Schedule $schedule
      * @param string $groupId
      * @return void
-     * @throws \Throwable
+     * @throws \Exception
      */
     protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId)
     {
@@ -292,6 +292,13 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
             call_user_func_array($callback, [$schedule]);
         } catch (\Throwable $e) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
+            if (!$e instanceof \Exception) {
+                $e = new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $e
+                );
+            }
             throw $e;
         }
 

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

@@ -489,9 +489,13 @@ public function dispatchExceptionInCallbackDataProvider()
                 new \Magento\Cron\Test\Unit\Model\CronJobException(
                     $throwable
                 ),
-                '',
+                'Error when running a cron job',
                 2,
-                $throwable
+                new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $throwable
+                )
             ],
         ];
     }