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

libct/cgroups/fscommon.WriteFile: use errors.Unwrap 

Tested that the EINTR is still being detected:

> $ go1.14 test -c # 1.14 is needed for EINTR to happen
> $ sudo ./fscommon.test
> INFO[0000] interrupted while writing 1063068 to /sys/fs/cgroup/memory/test-eint-89293785/memory.limit_in_bytes
> PASS

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-03-31 19:55:06 -07:00
parent 66778b3c28
commit e4e35b8de8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcontainer/cgroups/fscommon/fscommon.go
View File

@ -41,20 +41,10 @@ func ReadFile(dir, file string) (string, error) {
func retryingWriteFile(filename string, data []byte, perm os.FileMode) error { func retryingWriteFile(filename string, data []byte, perm os.FileMode) error {
for { for {
err := ioutil.WriteFile(filename, data, perm) err := ioutil.WriteFile(filename, data, perm)
if isInterruptedWriteFile(err) { if errors.Unwrap(err) == syscall.EINTR {
logrus.Infof("interrupted while writing %s to %s", string(data), filename) logrus.Infof("interrupted while writing %s to %s", string(data), filename)
continue continue
} }
return err return err
} }
} }
func isInterruptedWriteFile(err error) bool {
if patherr, ok := err.(*os.PathError); ok {
errno, ok2 := patherr.Err.(syscall.Errno)
if ok2 && errno == syscall.EINTR {
return true
}
}
return false
}