Merge pull request #358 from kormat/lock_failures

Fix handling of retry failures in Lock.acquire

Author: harlowja

kazoo/recipe/lock.py

@@ -87,6 +87,7 @@ def __init__(self, client, path, identifier=None):
         # some data is written to the node. this can be queried via
         # contenders() to see who is contending for the lock
         self.data = str(identifier or "").encode('utf-8')
+        self.node = None
 
         self.wake_event = client.handler.event_object()
 
@@ -160,8 +161,7 @@ def _acquire_lock():
                 gotten = retry(self._inner_acquire,
                                blocking=blocking, timeout=timeout)
             except RetryFailedError:
-                if not already_acquired:
-                    self._best_effort_cleanup()
+                pass
             except KazooException:
                 # if we did ultimately fail, attempt to clean up
                 exc_info = sys.exc_info()
@@ -172,7 +172,7 @@ def _acquire_lock():
             if gotten:
                 self.is_acquired = gotten
             if not gotten and not already_acquired:
-                self._delete_node(self.node)
+                self._best_effort_cleanup()
             return gotten
         finally:
             self._lock.release()
@@ -268,7 +268,7 @@ def _delete_node(self, node):
 
     def _best_effort_cleanup(self):
         try:
-            node = self._find_node()
+            node = self.node or self._find_node()
             if node:
                 self._delete_node(node)
         except KazooException:  # pragma: nocover