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

Merge pull request #18869 from vrothberg/debug-18860

Browse Source 
container wait: indicate timeout in error
This commit is contained in:
OpenShift Merge Robot
2023-06-13 09:38:52 -04:00
committed by GitHub
parent 17d19101c8 c0ab293131
commit 2a947c2f4b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_api.go
View File

@ -610,12 +610,14 @@ func (c *Container) WaitForExit(ctx context.Context, pollInterval time.Duration)
} }
} }
timedout := ""
if !containerRemoved { if !containerRemoved {
// If conmon is dead for more than $timerDuration or if the // If conmon is dead for more than $timerDuration or if the
// container has exited properly, try to look up the exit code. // container has exited properly, try to look up the exit code.
select { select {
case <-conmonTimer.C: case <-conmonTimer.C:
logrus.Debugf("Exceeded conmon timeout waiting for container %s to exit", id) logrus.Debugf("Exceeded conmon timeout waiting for container %s to exit", id)
timedout = " [exceeded conmon timeout waiting for container to exit]"
default: default:
switch c.state.State { switch c.state.State {
case define.ContainerStateExited, define.ContainerStateConfigured: case define.ContainerStateExited, define.ContainerStateConfigured:
@ -642,7 +644,7 @@ func (c *Container) WaitForExit(ctx context.Context, pollInterval time.Duration)
return true, 0, nil return true, 0, nil
} }
} }
return true, -1, fmt.Errorf("%w (container in state %s)", err, c.state.State) return true, -1, fmt.Errorf("%w (container in state %s)%s", err, c.state.State, timedout)
} }
return true, exitCode, nil return true, exitCode, nil