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

Merge pull request #1380 from mtaufen/working-set-fix

Browse Source 
Modify working set memory stats calculation
This commit is contained in:
Vish Kannan 2016-07-15 11:10:07 -07:00 committed by GitHub
commit 0f253fe687
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container/libcontainer/helpers.go
View File

@ -387,14 +387,8 @@ func toContainerStats2(s *cgroups.Stats, ret *info.ContainerStats) {
ret.Memory.ContainerData.Pgmajfault = v ret.Memory.ContainerData.Pgmajfault = v
ret.Memory.HierarchicalData.Pgmajfault = v ret.Memory.HierarchicalData.Pgmajfault = v
} }
if v, ok := s.MemoryStats.Stats["total_inactive_anon"]; ok {
workingSet := ret.Memory.Usage
if workingSet < v {
workingSet = 0
} else {
workingSet -= v
}
workingSet := ret.Memory.Usage
if v, ok := s.MemoryStats.Stats["total_inactive_file"]; ok { if v, ok := s.MemoryStats.Stats["total_inactive_file"]; ok {
if workingSet < v { if workingSet < v {
workingSet = 0 workingSet = 0
@ -403,7 +397,6 @@ func toContainerStats2(s *cgroups.Stats, ret *info.ContainerStats) {
} }
} }
ret.Memory.WorkingSet = workingSet ret.Memory.WorkingSet = workingSet
}
} }
func toContainerStats3(libcontainerStats *libcontainer.Stats, ret *info.ContainerStats) { func toContainerStats3(libcontainerStats *libcontainer.Stats, ret *info.ContainerStats) {