openstack/deb-kazoo
Code Issues Proposed changes

Merge pull request #146 from ReneSac/master

Browse Source 
Fix the order of exceptions in Lock.aquire
This commit is contained in:
Ben Bangert
2014-03-03 19:59:40 -08:00
parent da35fd4a9c 817bfdc7d1
commit 2e4774e697
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kazoo/recipe/lock.py
View File

@@ -104,13 +104,13 @@ class Lock(object):
retry.deadline = timeout retry.deadline = timeout
self.is_acquired = retry(self._inner_acquire, self.is_acquired = retry(self._inner_acquire,
blocking=blocking, timeout=timeout) blocking=blocking, timeout=timeout)
except RetryFailedError:
self._best_effort_cleanup()
except KazooException: except KazooException:
# if we did ultimately fail, attempt to clean up # if we did ultimately fail, attempt to clean up
self._best_effort_cleanup() self._best_effort_cleanup()
self.cancelled = False self.cancelled = False
raise raise
except RetryFailedError:
self._best_effort_cleanup()
if not self.is_acquired: if not self.is_acquired:
self._delete_node(self.node) self._delete_node(self.node)