ACP2E-82: Same cron job executes twice

Author: yvoronoy

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

@@ -866,7 +866,9 @@ private function tryRunJob($scheduledTime, $currentTime, $jobConfig, $schedule,
                     $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
                     break;
                 }
-                throw new CronException(__('Could not acquire lock for cron job: %1', $schedule->getJobCode()));
+                if ($retries === 1) {
+                    throw new CronException(__('Could not acquire lock for cron job: %1', $schedule->getJobCode()));
+                }
             }
         } 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);
     }