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

Support different field counts of cpuaact.stats 

Signed-off-by: skilxnTL <tylxltt@gmail.com>
This commit is contained in:
tianye15 2019-09-27 19:26:16 +08:00 committed by skilxnTL
parent 7507c64ff6
commit 28e58a0f6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/cgroups/fs/cpuacct.go
View File

@ -85,8 +85,8 @@ func getCpuUsageBreakdown(path string) (uint64, uint64, error) {
return 0, 0, err return 0, 0, err
} }
fields := strings.Fields(string(data)) fields := strings.Fields(string(data))
if len(fields) != 4 { if len(fields) < 4 {
return 0, 0, fmt.Errorf("failure - %s is expected to have 4 fields", filepath.Join(path, cgroupCpuacctStat)) return 0, 0, fmt.Errorf("failure - %s is expected to have at least 4 fields", filepath.Join(path, cgroupCpuacctStat))
} }
if fields[0] != userField { if fields[0] != userField {
return 0, 0, fmt.Errorf("unexpected field %q in %q, expected %q", fields[0], cgroupCpuacctStat, userField) return 0, 0, fmt.Errorf("unexpected field %q in %q, expected %q", fields[0], cgroupCpuacctStat, userField)