[ARVADOS] created: 1.3.0-558-gecb487a91

[Git user]

        at  ecb487a91cb70647950ca104264e672f957dfa86 (commit)


commit ecb487a91cb70647950ca104264e672f957dfa86
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Tue Mar 19 14:17:42 2019 -0400

    EXPERIMENTAL - look at hoststat.txt instead of crunchstat.txt + arv-mount.txt
    
    Arvados-DCO-1.1-Signed-off-by: Tom Morris <tfmorris at veritasgenetics.com>

diff --git a/tools/crunchstat-summary/crunchstat_summary/reader.py b/tools/crunchstat-summary/crunchstat_summary/reader.py
index 8ccdbc2fc..67efde438 100644
--- a/tools/crunchstat-summary/crunchstat_summary/reader.py
+++ b/tools/crunchstat-summary/crunchstat_summary/reader.py
@@ -26,6 +26,7 @@ class CollectionReader(object):
         # Crunch2 has multiple stats files
         if len(filenames) > 1:
             filenames = ['crunchstat.txt', 'arv-mount.txt']
+            filenames = ['hoststat.txt']
         for filename in filenames:
             try:
                 self._readers.append(collection.open(filename))

commit 5a936b8b1ed0c1847da8418bcf49f587603e907a
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Mon Mar 18 18:48:33 2019 -0400

    Fix elapsed time calculation.
    
    refs #14627
    
    Arvados-DCO-1.1-Signed-off-by: Tom Morris <tfmorris at veritasgenetics.com>

diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index bf905a394..c27b68b51 100644
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -167,9 +167,9 @@ class Summarizer(object):
             if task.finishtime is None or timestamp > task.finishtime:
                 task.finishtime = timestamp
 
-            if self.starttime is None or timestamp < task.starttime:
+            if self.starttime is None or timestamp < self.starttime:
                 self.starttime = timestamp
-            if self.finishtime is None or timestamp < task.finishtime:
+            if self.finishtime is None or timestamp > self.finishtime:
                 self.finishtime = timestamp
 
             if (not self.detected_crunch1) and task.starttime is not None and task.finishtime is not None:

commit 78d81336af7c25aa8471cc8046a17e7834d4e0bc
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Mon Mar 18 18:47:40 2019 -0400

    (re)fix typo
    
    Arvados-DCO-1.1-Signed-off-by: Tom Morris <tfmorris at veritasgenetics.com>

diff --git a/tools/crunchstat-summary/crunchstat_summary/webchart.py b/tools/crunchstat-summary/crunchstat_summary/webchart.py
index f7017e84d..cf0c1e67a 100644
--- a/tools/crunchstat-summary/crunchstat_summary/webchart.py
+++ b/tools/crunchstat-summary/crunchstat_summary/webchart.py
@@ -45,7 +45,7 @@ class WebChart(object):
                 'label': s.long_label(),
                 'charts': [
                     self.chartdata(s.label, s.tasks, stat)
-                    for stat in (('cp', 'user+sys__rate'),
+                    for stat in (('cpu', 'user+sys__rate'),
                                  ('mem', 'rss'),
                                  ('net:eth0', 'tx+rx__rate'),
                                  ('net:keep0', 'tx+rx__rate'))],

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


hooks/post-receive
--