Don't lose checkpoint state when lock is acquired from another

Jeroeny · Jeroeny · commit b64940641a56 · 2023-10-13T11:51:57.000+02:00
diff --git a/src/Symfony/Component/Scheduler/CHANGELOG.md b/src/Symfony/Component/Scheduler/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Add `ScheduledStamp` to `RedispatchMessage`
  * Allow modifying Schedule instances at runtime
  * Add `MessageProviderInterface` to trigger unique messages at runtime
+ * Continue from stored `Checkpoint` time when a lock is acquired
 
 6.3
 ---
diff --git a/src/Symfony/Component/Scheduler/Generator/Checkpoint.php b/src/Symfony/Component/Scheduler/Generator/Checkpoint.php
@@ -19,7 +19,6 @@ final class Checkpoint implements CheckpointInterface
     private \DateTimeImmutable $from;
     private \DateTimeImmutable $time;
     private int $index = -1;
-    private bool $reset = false;
 
     public function __construct(
         private readonly string $name,
@@ -31,17 +30,9 @@ public function __construct(
     public function acquire(\DateTimeImmutable $now): bool
     {
         if ($this->lock && !$this->lock->acquire()) {
-            // Reset local state if a Lock is acquired by another Worker.
-            $this->reset = true;
-
             return false;
         }
 
-        if ($this->reset) {
-            $this->reset = false;
-            $this->save($now, -1);
-        }
-
         if ($this->cache) {
             [$this->time, $this->index, $this->from] = $this->cache->get($this->name, fn () => [$now, -1, $now]) + [2 => $now];
             $this->save($this->time, $this->index);
diff --git a/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
@@ -178,14 +178,14 @@ public function testWithLockResetStateAfterLockedAcquiring()
         $checkpoint = new Checkpoint('locked', $lock);
         $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
 
-        $checkpoint->save($now->modify('-2 min'), 0);
+        $checkpoint->save($savedTime = $now->modify('-2 min'), $savedIndex = 0);
         $checkpoint->acquire($now->modify('-1 min'));
 
         $concurrentLock->release();
 
         $this->assertTrue($checkpoint->acquire($now));
-        $this->assertEquals($now, $checkpoint->time());
-        $this->assertEquals(-1, $checkpoint->index());
+        $this->assertEquals($savedTime, $checkpoint->time());
+        $this->assertEquals($savedIndex, $checkpoint->index());
         $this->assertTrue($lock->isAcquired());
         $this->assertFalse($concurrentLock->isAcquired());
     }
