prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #318 from vmarmol/fix-cpuset

Browse Source 
Fix raw driver's setting of CPU mask.
This commit is contained in:
Vish Kannan 2014-11-19 15:01:11 -08:00
commit 136969a7c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container/raw/handler.go
View File

@ -103,7 +103,7 @@ func readString(dirpath string, file string) string {
glog.Errorf("raw driver: Failed to read %q: %s", cgroupFile, err)
return ""
}
return string(out)
return strings.TrimSpace(string(out))
}
func readInt64(dirpath string, file string) uint64 {
@ -112,7 +112,7 @@ func readInt64(dirpath string, file string) uint64 {
return 0
}
val, err := strconv.ParseUint(strings.TrimSpace(out), 10, 64)
val, err := strconv.ParseUint(out, 10, 64)
if err != nil {
glog.Errorf("raw driver: Failed to parse int %q from file %q: %s", out, path.Join(dirpath, file), err)
return 0