openstack/swift
Code Issues Proposed changes

Warn when killing fails with EPERM

Browse Source 
Have swift-init warn when the running user doesn't have permissions to
signal processes.  Fixes bug 1017494.

Change-Id: Icb9048ab36f1ca73bb93b11c9c2aed882d99dfa7
This commit is contained in:
Darrell Bishop 2012-10-03 08:28:36 -07:00
parent 550e876869
commit 57ebd17910
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/manager.py
View File

@ -444,6 +444,8 @@ class Server():
if kwargs.get('verbose'):
print _("Removing stale pid file %s") % pid_file
remove_file(pid_file)
elif e.errno == errno.EPERM:
print _("No permission to signal PID %d") % pid
else:
# process exists
pids[pid] = pid_file

10
test/unit/common/test_manager.py
View File

@ -32,6 +32,7 @@ DUMMY_SIG = 1
class MockOs():
RAISE_EPERM_SIG = 99
def __init__(self, pids):
self.running_pids = pids
@ -41,6 +42,8 @@ class MockOs():
self.execlp_called = False
def kill(self, pid, sig):
if sig == self.RAISE_EPERM_SIG:
raise OSError(errno.EPERM, 'Operation not permitted')
if pid not in self.running_pids:
raise OSError(3, 'No such process')
self.pid_sigs[pid].append(sig)
@ -520,6 +523,7 @@ class TestServer(unittest.TestCase):
pid_files = (
('proxy-server.pid', 1),
('auth-server.pid', 2),
('object-server.pid', 3),
)
files, pids = zip(*pid_files)
with temptree(files, pids) as t:
@ -565,6 +569,12 @@ class TestServer(unittest.TestCase):
self.assert_('stale pid' in output.lower())
auth_pid = self.join_run_dir('auth-server.pid')
self.assert_(auth_pid in output)
# test warning with insufficient permissions
server = manager.Server('object')
pids = server.signal_pids(manager.os.RAISE_EPERM_SIG)
output = pop_stream(f)
self.assert_('no permission to signal pid 3' in
output.lower(), output)
finally:
sys.stdout = old_stdout