openstack/nova
Code Issues Proposed changes

Merge "Always log the releasing, even under failure"

Browse Source
This commit is contained in:
Jenkins 2014-09-19 02:31:30 +00:00 committed by Gerrit Code Review
commit 9d61eed7c1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/openstack/common/lockutils.py
View File

@ -227,13 +227,15 @@ def lock(name, lock_file_prefix=None, external=False, lock_path=None):
int_lock = internal_lock(name) int_lock = internal_lock(name)
with int_lock: with int_lock:
LOG.debug('Acquired semaphore "%(lock)s"', {'lock': name}) LOG.debug('Acquired semaphore "%(lock)s"', {'lock': name})
if external and not CONF.disable_process_locking: try:
ext_lock = external_lock(name, lock_file_prefix, lock_path) if external and not CONF.disable_process_locking:
with ext_lock: ext_lock = external_lock(name, lock_file_prefix, lock_path)
yield ext_lock with ext_lock:
else: yield ext_lock
yield int_lock else:
LOG.debug('Releasing semaphore "%(lock)s"', {'lock': name}) yield int_lock
finally:
LOG.debug('Releasing semaphore "%(lock)s"', {'lock': name})
def synchronized(name, lock_file_prefix=None, external=False, lock_path=None): def synchronized(name, lock_file_prefix=None, external=False, lock_path=None):