From 2cbe1dc0f85d7a30328d3d2b1e4080204cfe3b8f Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 28 Apr 2014 11:12:29 -0500 Subject: [PATCH] Only attempt to use sudo if necessary --- teuthology/kill.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/teuthology/kill.py b/teuthology/kill.py index 9f197dd8a6858..d090ff40c7c2b 100755 --- a/teuthology/kill.py +++ b/teuthology/kill.py @@ -7,6 +7,7 @@ import psutil import subprocess import tempfile import logging +import getpass from . import report from .config import config @@ -158,7 +159,12 @@ def kill_processes(run_name, pids=None): else: log.info("Killing Pids: " + str(to_kill)) for pid in to_kill: - subprocess.call(['sudo', 'kill', str(pid)]) + args = ['kill', str(pid)] + # Don't attempt to use sudo if it's not necessary + proc_user = psutil.Process(int(pid)).username() + if proc_user != getpass.getuser(): + args.insert(0, 'sudo') + subprocess.call(args) def process_matches_run(pid, run_name): -- 2.39.5