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

Min working set should be 0.

Browse Source 
Fixes #685
This commit is contained in:
Victor Marmol 2015-05-11 09:43:11 -07:00
parent c7908f7c95
commit 8928d487de
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
container/libcontainer/helpers.go
View File

@ -186,10 +186,21 @@ func toContainerStats2(s *cgroups.Stats, ret *info.ContainerStats) {
ret.Memory.HierarchicalData.Pgmajfault = v ret.Memory.HierarchicalData.Pgmajfault = v
} }
if v, ok := s.MemoryStats.Stats["total_inactive_anon"]; ok { if v, ok := s.MemoryStats.Stats["total_inactive_anon"]; ok {
ret.Memory.WorkingSet = ret.Memory.Usage - v workingSet := ret.Memory.Usage
if v, ok := s.MemoryStats.Stats["total_active_file"]; ok { if workingSet < v {
ret.Memory.WorkingSet -= v workingSet = 0
} else {
workingSet -= v
} }
if v, ok := s.MemoryStats.Stats["total_active_file"]; ok {
if workingSet < v {
workingSet = 0
} else {
workingSet -= v
}
}
ret.Memory.WorkingSet = workingSet
} }
} }