opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-07 07:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3595 from mheon/fix_exec_leak

Browse Source 
Remove exec PID files after use to prevent memory leaks
This commit is contained in:
OpenShift Merge Robot
2019-07-18 15:52:57 +02:00
committed by GitHub
parent adcde2383f 5bbede9d9f
commit 22e62e8691
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/container_api.go
View File

@ -305,6 +305,11 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir
if err != nil { if err != nil {
if exited { if exited {
// If the runtime exited, propagate the error we got from the process. // If the runtime exited, propagate the error we got from the process.
// We need to remove PID files to ensure no memory leaks
if err2 := os.Remove(pidFile); err2 != nil {
logrus.Errorf("Error removing exit file for container %s exec session %s: %v", c.ID(), sessionID, err2)
}
return err return err
} }
return errors.Wrapf(err, "timed out waiting for runtime to create pidfile for exec session in container %s", c.ID()) return errors.Wrapf(err, "timed out waiting for runtime to create pidfile for exec session in container %s", c.ID())
@ -312,6 +317,10 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir
// Pidfile exists, read it // Pidfile exists, read it
contents, err := ioutil.ReadFile(pidFile) contents, err := ioutil.ReadFile(pidFile)
// We need to remove PID files to ensure no memory leaks
if err2 := os.Remove(pidFile); err2 != nil {
logrus.Errorf("Error removing exit file for container %s exec session %s: %v", c.ID(), sessionID, err2)
}
if err != nil { if err != nil {
// We don't know the PID of the exec session // We don't know the PID of the exec session
// However, it may still be alive // However, it may still be alive