jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually check for syscall.ENODEV when checking if a container is paused 

It turns out that ioutil.Readfile wraps the error in a *os.PathError.
Since we cannot guarantee compilation with golang >= v1.13, we are
manually unwrapping the error.

Signed-off-by: Kieron Browne <kbrowne@pivotal.io>
This commit is contained in:
Yulia Nedyalkova 2020-03-31 15:52:20 +01:00 committed by Kieron Browne
parent 4a9e1747da
commit 2abc6a3605
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/container_linux.go
View File

@ -1832,7 +1832,10 @@ func (c *linuxContainer) isPaused() (bool, error) {
data, err := ioutil.ReadFile(filepath.Join(fcg, filename))
if err != nil {
// If freezer cgroup is not mounted, the container would just be not paused.
if os.IsNotExist(err) || err == syscall.ENODEV {
if os.IsNotExist(err) {
return false, nil
}
if pathError, isPathError := err.(*os.PathError); isPathError && pathError.Err == syscall.ENODEV {
return false, nil
}
return false, newSystemErrorWithCause(err, "checking if container is paused")