github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 15:20:17 +00:00
Code Issues Projects Releases Wiki Activity

Change process group when sending kill signal

Browse Source 
Otherwise when the target process is running sudo it ignores the signal.
This commit is contained in:
Bryan Boreham 2016-07-21 15:11:03 +01:00 committed by Bryan Boreham
parent 0b1f0e8353
commit a8d7e93d66
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/e2e_service.go
View File

@ -361,7 +361,10 @@ func (k *killCmd) Kill() error {
const timeout = 10 * time.Second const timeout = 10 * time.Second
for _, signal := range []string{"-TERM", "-KILL"} { for _, signal := range []string{"-TERM", "-KILL"} {
glog.V(2).Infof("Killing process %d (%s) with %s", pid, name, signal) glog.V(2).Infof("Killing process %d (%s) with %s", pid, name, signal)
_, err := exec.Command("sudo", "kill", signal, strconv.Itoa(pid)).Output() cmd := exec.Command("sudo", "kill", signal, strconv.Itoa(pid))
// Run the 'kill' command in a separate process group so sudo doesn't ignore it
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
_, err := cmd.Output()
if err != nil { if err != nil {
glog.Errorf("Error signaling process %d (%s) with %s: %v", pid, name, signal, err) glog.Errorf("Error signaling process %d (%s) with %s: %v", pid, name, signal, err)
continue continue