Merge pull request #240 from crosbymichael/wait

Reap process after sending kill signal
hashicorp · Oct 9, 2015 · 2e4f1ae · 2e4f1ae
2 parents f58407d + 9b6e1b4
commit 2e4f1ae
Showing 1 changed file with 5 additions and 0 deletions.
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.