ensure we call wait() on children created by nsenter

we were ending up with 1 zombie for every container created, since nothing was waiting on the intermediate child created by nsenter. Signed-off-by: James Pepin <[email protected]>
opencontainers · Jan 22, 2019 · b55bb58 · b55bb58
1 parent c1e454b
commit b55bb58
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
@@ -236,6 +236,15 @@ func (p *initProcess) getChildPid() (int, error) {
 		p.cmd.Wait()
 		return -1, err
 	}
+	// Clean up the zombie parent process && ignore errors like in setnsProcess
+	firstChildProcess, err := os.FindProcess(pid.PidFirstChild)
+	if err != nil {
+		return pid.Pid, nil
+	}
+
+	// Ignore the error in case the child has already been reaped for any reason
+	_, _ = firstChildProcess.Wait()
+
 	return pid.Pid, nil
 }