From 9b5bcd692fd5a24ca455e1a4354731f018a97289 Mon Sep 17 00:00:00 2001 From: Marcin Matlaszek Date: Tue, 6 Feb 2018 21:08:14 +0100 Subject: [PATCH] Make raw_exec processes cleanup function more precise. --- client/driver/executor/executor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index d47930b7c125..d59c7e28cb91 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -450,7 +450,7 @@ func ClientCleanup(ic *dstructs.IsolationConfig, pid int) error { } // Cleanup any still hanging user processes -func (e *UniversalExecutor) cleanupUserLeftovers(proc *os.Process) error { +func (e *UniversalExecutor) cleanupChildProcesses(proc *os.Process) error { // If new process group was created upon command execution // we can kill the whole process group now to cleanup any leftovers. if e.cmd.SysProcAttr != nil && e.cmd.SysProcAttr.Setpgid { @@ -490,7 +490,7 @@ func (e *UniversalExecutor) Exit() error { if err != nil { e.logger.Printf("[ERR] executor: can't find process with pid: %v, err: %v", e.cmd.Process.Pid, err) - } else if err := e.cleanupUserLeftovers(proc); err != nil && err.Error() != finishedErr { + } else if err := e.cleanupChildProcesses(proc); err != nil && err.Error() != finishedErr { merr.Errors = append(merr.Errors, fmt.Errorf("can't kill process with pid: %v, err: %v", e.cmd.Process.Pid, err)) }