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

Merge pull request #24400 from giuseppe/fix-race-reading-cgroup-stats 

libpod: report cgroups deleted during Stat() call
This commit is contained in:
openshift-merge-bot[bot] 2024-10-29 12:20:36 +00:00 committed by GitHub
parent b52e6cc874 1f44d0f8b2
commit 364761fc30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/stats_linux.go
View File

@ -3,6 +3,7 @@
package libpod package libpod
import ( import (
"errors"
"fmt" "fmt"
"strings" "strings"
"syscall" "syscall"
@ -36,6 +37,11 @@ func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, prev
// Ubuntu does not have swap memory in cgroups because swap is often not enabled. // Ubuntu does not have swap memory in cgroups because swap is often not enabled.
cgroupStats, err := cgroup.Stat() cgroupStats, err := cgroup.Stat()
if err != nil { if err != nil {
// cgroup.Stat() is not an atomic operation, so it is possible that the cgroup is removed
// while Stat() is running. Try to catch this case and return a more specific error.
if (errors.Is(err, unix.ENOENT) || errors.Is(err, unix.ENODEV)) && !cgroupExist(cgroupPath) {
return fmt.Errorf("cgroup %s does not exist: %w", cgroupPath, define.ErrCtrStopped)
}
return fmt.Errorf("unable to obtain cgroup stats: %w", err) return fmt.Errorf("unable to obtain cgroup stats: %w", err)
} }
conState := c.state.State conState := c.state.State