Merge pull request #15986 from yujuhong/mem_inuse

e2e: change resource monitor to log memory working set
pull/6/head
Filip Grzadkowski 2015-10-22 14:49:18 +02:00
commit 295d28e101
1 changed files with 1 additions and 1 deletions

View File

@ -281,7 +281,7 @@ func formatResourceUsageStats(nodeName string, containerStats map[string]*contai
w := tabwriter.NewWriter(buf, 1, 0, 1, ' ', 0)
fmt.Fprintf(w, "container\tcpu(cores)\tmemory(MB)\n")
for name, s := range containerStats {
fmt.Fprintf(w, "%q\t%.3f\t%.2f\n", name, s.CPUUsageInCores, float64(s.MemoryUsageInBytes)/1000000)
fmt.Fprintf(w, "%q\t%.3f\t%.2f\n", name, s.CPUUsageInCores, float64(s.MemoryWorkingSetInBytes)/(1024*1024))
}
w.Flush()
return fmt.Sprintf("Resource usage on node %q:\n%s", nodeName, buf.String())