openstack
/
nova
Code Issues Proposed changes

fix cleanup_file_locks with restricted permissions 

SELinux was seen to disallow kill(pid, 0).
Therefore ensure that the pid is determined
to be still running if we get EPERM.

Fixes bug: 1051924
Change-Id: Ib84e2fc460066ee03070b9bda15732cce573ccf3
This commit is contained in:
Pádraig Brady 2012-09-17 13:19:18 +01:00
parent 47dabb30dc
commit 10766995ec
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/utils.py
View File

@ -21,6 +21,7 @@
import contextlib
import datetime
import errno
import functools
import hashlib
import inspect
@ -1000,11 +1001,12 @@ def cleanup_file_locks():
{'filename': filename, 'pid': pid})
try:
os.kill(int(pid), 0)
except OSError, e:
# PID wasn't found
delete_if_exists(os.path.join(FLAGS.lock_path, filename))
LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s') %
{'filename': filename, 'pid': pid})
except OSError as e:
if e.errno == errno.ESRCH:
# PID wasn't found
delete_if_exists(os.path.join(FLAGS.lock_path, filename))
LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s') %
{'filename': filename, 'pid': pid})
# cleanup lock files
for filename in files:
@ -1013,8 +1015,8 @@ def cleanup_file_locks():
continue
try:
stat_info = os.stat(os.path.join(FLAGS.lock_path, filename))
except OSError as (errno, strerror):
if errno == 2: # doesn't exist
except OSError as e:
if e.errno == errno.ENOENT:
continue
else:
raise
@ -1033,8 +1035,8 @@ def delete_if_exists(pathname):
try:
os.unlink(pathname)
except OSError as (errno, strerror):
if errno == 2: # doesn't exist
except OSError as e:
if e.errno == errno.ENOENT:
return
else:
raise