[ARVADOS] updated: 1.3.0-816-ged35acd2e

[Git user]

Summary of changes:
 build/run-tests.sh                                      |  1 +
 .../crunchstat-summary/crunchstat_summary/summarizer.py | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

       via  ed35acd2e173b4fae4499d6ec21211cd2076e91c (commit)
       via  6c1b0fb33cc6dcd5430233cf4399fe93fd863a9b (commit)
       via  2266cd0b5066ef366c5ee76b5818b9aea344f9ae (commit)
      from  c3ba32d18b341a28d2b8c31930063aba14e75a30 (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 ed35acd2e173b4fae4499d6ec21211cd2076e91c
Merge: c3ba32d18 6c1b0fb33
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Wed Apr 24 12:19:12 2019 -0400

    Merge branch '14939-crunchstat-summary-python3-fixup'
    
    Fixes #14939
    
    Arvados-DCO-1.1-Signed-off-by: Tom Morris <tfmorris at veritasgenetics.com>


commit 6c1b0fb33cc6dcd5430233cf4399fe93fd863a9b
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Mon Apr 22 15:34:39 2019 -0400

    Fix iteration order dependency.
    
    Causes tests to fail in Python 3.5, but not Python 3.7 due to dependency on iteration order of dicts.
    
    Refs #14939
    
    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..6d567e68d 100644
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -207,17 +207,18 @@ class Summarizer(object):
                     stats['user+sys'] = stats.get('user', 0) + stats.get('sys', 0)
                 if 'tx' in stats or 'rx' in stats:
                     stats['tx+rx'] = stats.get('tx', 0) + stats.get('rx', 0)
-                for stat, val in stats.items():
-                    if group == 'interval':
-                        if stat == 'seconds':
-                            this_interval_s = val
-                            continue
-                        elif not (this_interval_s > 0):
+                if group == 'interval':
+                    if 'seconds' in stats:
+                        this_interval_s = stats.get('seconds',0)
+                        del stats['seconds']
+                        if this_interval_s <= 0:
                             logger.error(
                                 "BUG? interval stat given with duration {!r}".
                                 format(this_interval_s))
-                            continue
-                        else:
+                    else:
+                        logger.error('BUG? interval stat missing duration')
+                for stat, val in stats.items():
+                    if group == 'interval' and this_interval_s:
                             stat = stat + '__rate'
                             val = val / this_interval_s
                             if stat in ['user+sys__rate', 'tx+rx__rate']:

commit 2266cd0b5066ef366c5ee76b5818b9aea344f9ae
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 8ff6326f3..d8ae7c3c9 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -975,6 +975,7 @@ pythonstuff=(
     services/fuse
     services/nodemanager
     tools/crunchstat-summary
+    tools/crunchstat-summary:py3
 )
 
 declare -a gostuff

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


hooks/post-receive
--