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

Merge pull request #24381 from t4chib4ne/kube-play-wait-interval

Browse Source 
stop podman kube play --wait from using 100% CPU
This commit is contained in:
openshift-merge-bot[bot]
2024-11-01 12:51:09 +00:00
committed by GitHub
parent d40ff2a0de 314dece926
commit 496e7ca024
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_api.go
View File

@ -543,6 +543,8 @@ func (c *Container) Wait(ctx context.Context) (int32, error) {
// WaitForExit blocks until the container exits and returns its exit code. The
// argument is the interval at which checks the container's status.
// If the argument is less than or equal to 0 Nanoseconds a default interval is
// used.
func (c *Container) WaitForExit(ctx context.Context, pollInterval time.Duration) (int32, error) {
id := c.ID()
if !c.valid {
@ -593,6 +595,10 @@ func (c *Container) WaitForExit(ctx context.Context, pollInterval time.Duration)
defer unix.Close(conmonPidFd)
}
if pollInterval <= 0 {
pollInterval = DefaultWaitInterval
}
// we cannot wait locked as we would hold the lock forever, so we unlock and then lock again
c.lock.Unlock()
err := waitForConmonExit(ctx, conmonPID, conmonPidFd, pollInterval)