RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart_runner: only kill/look at user's processes

Browse Source 
This prevents vstart_runner.py from trying to kill other user's
ceph-mds/ceph-fuse instances.
This commit is contained in:
Patrick Donnelly 2016-06-07 16:20:27 -04:00
parent ccb635ff5f
commit 1675a47d0f
No known key found for this signature in database
GPG Key ID: 214CC3B002E532F6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/cephfs/vstart_runner.py
View File

@ -257,14 +257,14 @@ class LocalDaemon(object):
Return PID as an integer or None if not found
"""
ps_txt = self.controller.run(
args=["ps", "aux"]
args=["ps", "-u"+str(os.getuid())]
).stdout.getvalue().strip()
lines = ps_txt.split("\n")[1:]
for line in lines:
if line.find("ceph-{0} -i {1}".format(self.daemon_type, self.daemon_id)) != -1:
log.info("Found ps line for daemon: {0}".format(line))
return int(line.split()[1])
return int(line.split()[0])
return None
@ -684,13 +684,13 @@ def exec_test():
# Tolerate no MDSs or clients running at start
ps_txt = remote.run(
args=["ps", "aux"]
args=["ps", "-u"+str(os.getuid())]
).stdout.getvalue().strip()
lines = ps_txt.split("\n")[1:]
for line in lines:
if 'ceph-fuse' in line or 'ceph-mds' in line:
pid = int(line.split()[1])
pid = int(line.split()[0])
log.warn("Killing stray process {0}".format(line))
os.kill(pid, signal.SIGKILL)