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

Merge pull request #835 from rjnagal/docker

Browse Source 
Fix converion of rss and vsz in ps output.
This commit is contained in:
Victor Marmol 2015-07-24 10:12:25 -07:00
commit b581ee2e67
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manager/container.go
View File

@ -248,10 +248,14 @@ func (c *containerData) GetProcessList(cadvisorContainer string, inHostNamespace
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid rss %q: %v", fields[6], err) return nil, fmt.Errorf("invalid rss %q: %v", fields[6], err)
} }
// convert to bytes
rss *= 1024
vs, err := strconv.ParseUint(fields[7], 0, 64) vs, err := strconv.ParseUint(fields[7], 0, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid virtual size %q: %v", fields[7], err) return nil, fmt.Errorf("invalid virtual size %q: %v", fields[7], err)
} }
// convert to bytes
vs *= 1024
cgroup, err := c.getCgroupPath(fields[11]) cgroup, err := c.getCgroupPath(fields[11])
if err != nil { if err != nil {
return nil, fmt.Errorf("could not parse cgroup path from %q: %v", fields[11], err) return nil, fmt.Errorf("could not parse cgroup path from %q: %v", fields[11], err)