x/gantt
Code Issues Proposed changes

Merge "OS X Support fixed, bug 942352"

Browse Source
This commit is contained in:
Jenkins
2012-02-28 19:17:07 +00:00
committed by Gerrit Code Review
parent 77ce86b2f4 722c2c35ac
commit a62338dccf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/utils.py
View File

@@ -903,10 +903,13 @@ def cleanup_file_locks():
pid = match.group(1) pid = match.group(1)
LOG.debug(_('Found sentinel %(filename)s for pid %(pid)s' % LOG.debug(_('Found sentinel %(filename)s for pid %(pid)s' %
{'filename': filename, 'pid': pid})) {'filename': filename, 'pid': pid}))
if not os.path.exists(os.path.join('/proc', pid)): try:
os.kill(int(pid), 0)
except OSError, e:
# PID wasn't found
delete_if_exists(os.path.join(FLAGS.lock_path, filename)) delete_if_exists(os.path.join(FLAGS.lock_path, filename))
LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s' % LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s' %
{'filename': filename, 'pid': pid})) {'filename': filename, 'pid': pid}))
# cleanup lock files # cleanup lock files
for filename in files: for filename in files: