Merge pull request #240 from crosbymichael/wait

dadgar · dadgar · commit 2e4f1ae805bc · 2015-10-08T17:10:23.000-07:00
Reap process after sending kill signal
diff --git a/client/executor/exec_linux.go b/client/executor/exec_linux.go
@@ -542,6 +542,11 @@ func (e *LinuxExecutor) destroyCgroup() error {
 			multierror.Append(errs, fmt.Errorf("Failed to kill Pid %v: %v", pid, err))
 			continue
 		}
+
+		if _, err := process.Wait(); err != nil {
+			multierror.Append(errs, fmt.Errorf("Failed to wait Pid %v: %v", pid, err))
+			continue
+		}
 	}
 
 	// Remove the cgroup.

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,11 @@ func (e *LinuxExecutor) destroyCgroup() error {`
`542`	`542`	`multierror.Append(errs, fmt.Errorf("Failed to kill Pid %v: %v", pid, err))`
`543`	`543`	`continue`
`544`	`544`	`}`
	`545`	`+`
	`546`	`+ if _, err := process.Wait(); err != nil {`
	`547`	`+ multierror.Append(errs, fmt.Errorf("Failed to wait Pid %v: %v", pid, err))`
	`548`	`+ continue`
	`549`	`+ }`
`545`	`550`	`}`
`546`	`551`
`547`	`552`	`// Remove the cgroup.`