[ARVADOS] updated: 1.3.0-609-gbac750df0

[Git user]

Summary of changes:
 lib/crunchstat/crunchstat.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  bac750df0495c10d7181edfda48ba6e28e807e1e (commit)
       via  3091e5692d3c558f861355aad4448a8fd7b9bdee (commit)
      from  b3be9ab4ce2c15a4340a5304afa1b3ddccb0e05d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bac750df0495c10d7181edfda48ba6e28e807e1e
Merge: b3be9ab4c 3091e5692
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Mar 28 13:44:05 2019 -0400

    Merge branch '14998-hoststat-total'
    
    fixes #14998
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 3091e5692d3c558f861355aad4448a8fd7b9bdee
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Mar 19 15:49:49 2019 -0400

    14998: Report total_* (hierarchy) stats if available.
    
    Otherwise, host stats only include the root cgroup.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/crunchstat/crunchstat.go b/lib/crunchstat/crunchstat.go
index 8afe82819..028083fa0 100644
--- a/lib/crunchstat/crunchstat.go
+++ b/lib/crunchstat/crunchstat.go
@@ -256,8 +256,13 @@ func (r *Reporter) doMemoryStats() {
 	}
 	var outstat bytes.Buffer
 	for _, key := range wantStats {
-		if val, ok := thisSample.memStat[key]; ok {
-			outstat.WriteString(fmt.Sprintf(" %d %s", val, key))
+		// Use "total_X" stats (entire hierarchy) if enabled,
+		// otherwise just the single cgroup -- see
+		// https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt
+		if val, ok := thisSample.memStat["total_"+key]; ok {
+			fmt.Fprintf(&outstat, " %d %s", val, key)
+		} else if val, ok := thisSample.memStat[key]; ok {
+			fmt.Fprintf(&outstat, " %d %s", val, key)
 		}
 	}
 	r.Logger.Printf("mem%s\n", outstat.String())

-----------------------------------------------------------------------


hooks/post-receive
--