Ensure unique job lock is released only once in lifecycle

laravel · Nov 18, 2020 · 2a6e9d3 · 2a6e9d3
1 parent 72306be
commit 2a6e9d3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Illuminate/Queue/CallQueuedHandler.php b/src/Illuminate/Queue/CallQueuedHandler.php
@@ -29,6 +29,13 @@ class CallQueuedHandler
      */
     protected $container;
 
+    /**
+     * Indicates if the unique job lock has been released.
+     *
+     * @var bool
+     */
+    protected $uniqueLockReleased = false;
+
     /**
      * Create a new handler instance.
      *
@@ -171,7 +178,7 @@ protected function ensureSuccessfulBatchJobIsRecorded($command)
      */
     protected function ensureUniqueJobLockIsReleased($command)
     {
-        if (! $command instanceof ShouldBeUnique) {
+        if (! ($command instanceof ShouldBeUnique) || $this->uniqueLockReleased) {
             return;
         }
 
@@ -186,6 +193,8 @@ protected function ensureUniqueJobLockIsReleased($command)
         $cache->lock(
             'laravel_unique_job:'.get_class($command).$uniqueId
         )->forceRelease();
+
+        $this->uniqueLockReleased = true;
     }
 
     /**