Merge branch 'master' into master

python-zk · Sep 25, 2018 · efbe658 · efbe658
2 parents e005a10 + 7a8167d
commit efbe658
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/kazoo/recipe/queue.py b/kazoo/recipe/queue.py
@@ -335,10 +335,19 @@ def _take(self, id_):
                     id=id_),
                 self.id,
                 ephemeral=True)
+        except NodeExistsError:
+            # Item is already locked
+            return None
+
+        try:
             value, stat = self.client.retry(
                 self.client.get,
                 "{path}/{id}".format(path=self._entries_path, id=id_))
-        except (NoNodeError, NodeExistsError):
-            # Item is already consumed or locked
+        except NoNodeError:
+            # Item is already consumed
+            self.client.delete(
+                "{path}/{id}".format(
+                    path=self._lock_path,
+                    id=id_))
             return None
         return (id_, value)