Merge branch 'master' into 4592-input-selection

[arvados.git] / services / crunchstat / crunchstat.go

diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 728f1a437401798759f184327bec4684649966c8..0cfdfa88ee168186b11958d92742098cf7dba6c6 100644 (file)
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -192,7 +192,7 @@ func DoMemoryStats(cgroup Cgroup) {
        defer c.Close()
        b := bufio.NewScanner(c)
        thisSample := MemSample{time.Now(), make(map[string]int64)}
-       wantStats := [...]string{"cache", "pgmajfault", "rss"}
+       wantStats := [...]string{"cache", "swap", "pgmajfault", "rss"}
        for b.Scan() {
                var stat string
                var val int64