go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3102 from stripe:andrew/cgroup-eintr 

PiperOrigin-RevId: 323638518
This commit is contained in:
gVisor bot 2020-07-28 13:16:30 -07:00
parent 5873b0f43f 079123b363
commit 8518800090
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
runsc/cgroup/cgroup.go
View File

@ -92,7 +92,17 @@ func setOptionalValueUint16(path, name string, val *uint16) error {
func setValue(path, name, data string) error { func setValue(path, name, data string) error {
fullpath := filepath.Join(path, name) fullpath := filepath.Join(path, name)
return ioutil.WriteFile(fullpath, []byte(data), 0700)
// Retry writes on EINTR; see:
// https://github.com/golang/go/issues/38033
for {
err := ioutil.WriteFile(fullpath, []byte(data), 0700)
if err == nil {
return nil
} else if !errors.Is(err, syscall.EINTR) {
return err
}
}
} }
func getValue(path, name string) (string, error) { func getValue(path, name string) (string, error) {
@ -132,8 +142,16 @@ func fillFromAncestor(path string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if err := ioutil.WriteFile(path, []byte(val), 0700); err != nil {
return "", err // Retry writes on EINTR; see:
// https://github.com/golang/go/issues/38033
for {
err := ioutil.WriteFile(path, []byte(val), 0700)
if err == nil {
break
} else if !errors.Is(err, syscall.EINTR) {
return "", err
}
} }
return val, nil return val, nil
} }