diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-15 10:10:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 10:10:00 -0800 |
| commit | 0ee56e57df914d280fe3b070ff80e20424e4f3b0 (patch) | |
| tree | df5818f17ebaed149405d65712626f3fc8486843 | |
| parent | 97bded4a52c8d829c350eb170d4c3afd30f92d72 (diff) | |
| parent | c3d8328150d12bd0981a43aeea2924bcc4d5c1cc (diff) | |
| download | podman-0ee56e57df914d280fe3b070ff80e20424e4f3b0.tar.gz podman-0ee56e57df914d280fe3b070ff80e20424e4f3b0.tar.bz2 podman-0ee56e57df914d280fe3b070ff80e20424e4f3b0.zip | |
Merge pull request #1818 from EmilienM/issue/1816
Increase pidWaitTimeout to 60s
| -rw-r--r-- | libpod/container_api.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index d99aec5b4..390987394 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -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 |