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

Merge pull request #638 from lizf-os/fix-check-cpu-shares 

Avoid trying to access cpu.shares when it doesn't exist
This commit is contained in:
Mrunal Patel 2015-06-18 13:41:58 -07:00
parent ed1146a8ee f112d83776
commit 107b7ed268
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cgroups/fs/apply_raw.go
View File

@ -304,6 +304,10 @@ func removePath(p string, err error) error {
func CheckCpushares(path string, c int64) error {
var cpuShares int64
if c == 0 {
return nil
}
fd, err := os.Open(filepath.Join(path, "cpu.shares"))
if err != nil {
return err
@ -314,12 +318,11 @@ func CheckCpushares(path string, c int64) error {
if err != nil && err != io.EOF {
return err
}
if c != 0 {
if c > cpuShares {
return fmt.Errorf("The maximum allowed cpu-shares is %d", cpuShares)
} else if c < cpuShares {
return fmt.Errorf("The minimum allowed cpu-shares is %d", cpuShares)
}
if c > cpuShares {
return fmt.Errorf("The maximum allowed cpu-shares is %d", cpuShares)
} else if c < cpuShares {
return fmt.Errorf("The minimum allowed cpu-shares is %d", cpuShares)
}
return nil