From f0c5e7eca3842411d4e3ee6efb3fd6ac0ad85f4a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 26 Jun 2010 15:07:32 -0400
Subject: [PATCH] Fix for bug #2382: releasing claim on failed queue item works
 again with DB-based queues. Warning: DB-based queue doesn't currently
 implement discarding of items after a retry limit. Failed items will be
 retried until they succeed.

---
 classes/Queue_item.php | 13 +++++++++++++
 lib/dbqueuemanager.php |  4 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index f83c2cef18..c7e17be6e8 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -64,4 +64,17 @@ class Queue_item extends Memcached_DataObject
         $qi = null;
         return null;
     }
+
+    /**
+     * Release a claimed item.
+     */
+    function releaseCLaim()
+    {
+        // DB_DataObject doesn't let us save nulls right now
+        $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->id);
+        $this->query($sql);
+
+        $this->claimed = null;
+        $this->encache();
+    }
 }
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 3032e4ec7a..3dda9fd1ac 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -135,9 +135,7 @@ class DBQueueManager extends QueueManager
         if (empty($qi->claimed)) {
             $this->_log(LOG_WARNING, "[$queue:item $qi->id] Ignoring failure for unclaimed queue item");
         } else {
-            $orig = clone($qi);
-            $qi->claimed = null;
-            $qi->update($orig);
+            $qi->releaseClaim();
         }
 
         $this->stats('error', $queue);
-- 
2.39.2