containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1818 from EmilienM/issue/1816 

Increase pidWaitTimeout to 60s
This commit is contained in:
OpenShift Merge Robot 2018-11-15 10:10:00 -08:00 committed by GitHub
parent 97bded4a52 c3d8328150
commit 0ee56e57df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container_api.go
View File

@ -330,9 +330,10 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user string) e
}
pidFile := c.execPidPath(sessionID)
// 1 second seems a reasonable time to wait
// See https://github.com/containers/libpod/issues/1495
const pidWaitTimeout = 1000
// 60 second seems a reasonable time to wait
// https://github.com/containers/libpod/issues/1495
// https://github.com/containers/libpod/issues/1816
const pidWaitTimeout = 60000
// Wait until the runtime makes the pidfile
// TODO: If runtime errors before the PID file is created, we have to