[ARVADOS] created: 1.3.0-767-g8c345b8d1
Git user
git at public.curoverse.com
Fri Apr 19 21:16:39 UTC 2019
at 8c345b8d144346687c4805ae864a2fcdcbfab609 (commit)
commit 8c345b8d144346687c4805ae864a2fcdcbfab609
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date: Wed Mar 27 13:19:24 2019 -0400
Add crunchstat-summary Python 3 to all tests.
Refs #14939
Arvados-DCO-1.1-Signed-off-by: Tom Morris <tfmorris at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index dbf13940b..7f6433dbd 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -973,6 +973,7 @@ pythonstuff=(
services/fuse
services/nodemanager
tools/crunchstat-summary
+ tools/crunchstat-summary:py3
)
declare -a gostuff
commit f7d58d8583516533c6194a91f7b40105fafba3a7
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 4b7e404ca42666b83d4980854731d6563c25eb0f
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'))],
commit 6f3c2bedf64cc6a60235b0437245863b0cda0913
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date: Fri Mar 8 18:40:24 2019 -0500
Update crunchstat-summary to Python 3. Refs #14939
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 cf0c1e67a..f7017e84d 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 (('cpu', 'user+sys__rate'),
+ for stat in (('cp', 'user+sys__rate'),
('mem', 'rss'),
('net:eth0', 'tx+rx__rate'),
('net:keep0', 'tx+rx__rate'))],
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list