Merge pull request #1100 from coreos-inc/queueitemnonexistant

Catch other cases where the queue item has been removed

data/queue.py

@@ -213,6 +213,8 @@ class WorkQueue(object):
   def incomplete(self, incomplete_item, retry_after=300, restore_retry=False):
     with self._transaction_factory(db):
       retry_date = datetime.utcnow() + timedelta(seconds=retry_after)
+
+      try:
         incomplete_item_obj = self._item_by_id_for_update(incomplete_item.id)
         incomplete_item_obj.available_after = retry_date
         incomplete_item_obj.available = True
@@ -223,9 +225,12 @@ class WorkQueue(object):
         incomplete_item_obj.save()
         self._currently_processing = False
         return incomplete_item_obj.retries_remaining > 0
+      except QueueItem.DoesNotExist:
+        return False
 
   def extend_processing(self, item, seconds_from_now, minimum_extension=MINIMUM_EXTENSION):
     with self._transaction_factory(db):
+      try:
         queue_item = self._item_by_id_for_update(item.id)
         new_expiration = datetime.utcnow() + timedelta(seconds=seconds_from_now)
 
@@ -233,3 +238,6 @@ class WorkQueue(object):
         if new_expiration - queue_item.processing_expires > minimum_extension:
           queue_item.processing_expires = new_expiration
           queue_item.save()
+      except QueueItem.DoesNotExist:
+        return
+