diff options
| author | Emilien Macchi <emilien@redhat.com> | 2018-11-15 09:32:51 -0500 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2018-11-15 10:58:27 -0500 |
| commit | c3d8328150d12bd0981a43aeea2924bcc4d5c1cc (patch) | |
| tree | df5818f17ebaed149405d65712626f3fc8486843 | |
| parent | 97bded4a52c8d829c350eb170d4c3afd30f92d72 (diff) | |
| download | podman-c3d8328150d12bd0981a43aeea2924bcc4d5c1cc.tar.gz podman-c3d8328150d12bd0981a43aeea2924bcc4d5c1cc.tar.bz2 podman-c3d8328150d12bd0981a43aeea2924bcc4d5c1cc.zip | |
Increase pidWaitTimeout to 60s
At scale, it appears that we sometimes hit the 1000ms timeout to create
the PID file when a container is created or executed.
Increasing the value to 60s should help when running a lot of containers
in heavy-loaded environment.
Related #1495
Fixes #1816
Signed-off-by: Emilien Macchi <emilien@redhat.com>
| -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 |