Merge branch 'ACP2E-82' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

Author: ArtemVasyliev

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

@@ -14,6 +14,7 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\CronException;
 use Magento\Framework\Profiler\Driver\Standard\Stat;
 use Magento\Framework\Profiler\Driver\Standard\StatFactory;
 use Magento\Cron\Model\DeadlockRetrierInterface;
@@ -822,10 +823,16 @@ private function processPendingJobs(string $groupId, array $jobsRoot, int $curre
                 continue;
             }
 
-            $this->tryRunJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
-
-            if ($schedule->getStatus() === Schedule::STATUS_SUCCESS) {
-                $processedJobs[$schedule->getJobCode()] = true;
+            try {
+                $this->tryRunJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
+                if ($schedule->getStatus() === Schedule::STATUS_SUCCESS) {
+                    $processedJobs[$schedule->getJobCode()] = true;
+                }
+            } catch (CronException $e) {
+                $this->logger->warning($e->getMessage());
+                continue;
+            } catch (\Exception $e) {
+                $this->processError($schedule, $e);
             }
 
             $this->retrier->execute(
@@ -845,6 +852,7 @@ function () use ($schedule) {
      * @param string[] $jobConfig
      * @param Schedule $schedule
      * @param string $groupId
+     * @throws CronException
      */
     private function tryRunJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId)
     {
@@ -858,10 +866,10 @@ private function tryRunJob($scheduledTime, $currentTime, $jobConfig, $schedule,
                     $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
                     break;
                 }
-                $this->logger->warning("Could not acquire lock for cron job: {$schedule->getJobCode()}");
+                if ($retries === 1) {
+                    throw new CronException(__('Could not acquire lock for cron job: %1', $schedule->getJobCode()));
+                }
             }
-        } catch (\Exception $e) {
-            $this->processError($schedule, $e);
         } finally {
             $this->lockManager->unlock($lockName);
         }

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

@@ -307,15 +307,15 @@ public function testDispatchCanNotLock(): void
         $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->willReturn($dateScheduledAt);
         $schedule->expects($this->exactly(5))->method('tryLockJob')->willReturn(false);
         $schedule->expects($this->never())->method('setFinishedAt');
-        $schedule->expects($this->once())->method('getResource')->willReturn($this->scheduleResourceMock);
+        $schedule->expects($this->never())->method('getResource')->willReturn($this->scheduleResourceMock);
 
         $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
-        $this->scheduleResourceMock->expects($this->once())
+        $this->scheduleResourceMock->expects($this->never())
             ->method('getConnection')
             ->willReturn($connectionMock);
 
-        $this->retrierMock->expects($this->once())
+        $this->retrierMock->expects($this->never())
             ->method('execute')
             ->willReturnCallback(
                 function ($callback) {
@@ -341,7 +341,9 @@ function ($callback) {
         $this->scheduleFactoryMock->expects($this->atLeastOnce())
             ->method('create')
             ->willReturn($scheduleMock);
-
+        $this->loggerMock->expects($this->once())
+            ->method('warning')
+            ->with('Could not acquire lock for cron job: test_job1');
         $this->cronQueueObserver->execute($this->observerMock);
     }