[ARVADOS] updated: 1.3.0-818-g379f15edc

Git user git at public.curoverse.com
Wed Apr 24 16:21:30 UTC 2019


Summary of changes:
 tools/crunchstat-summary/crunchstat_summary/summarizer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  379f15edca3764e7236cdd89937efd5bade04059 (commit)
       via  ceabb22f25be2573c1d37dafaf2b34d2d89e1c62 (commit)
      from  ed35acd2e173b4fae4499d6ec21211cd2076e91c (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 379f15edca3764e7236cdd89937efd5bade04059
Merge: ed35acd2e ceabb22f2
Author: Tom Morris <tfmorris at veritasgenetics.com>
Date:   Wed Apr 24 12:20:58 2019 -0400

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


commit ceabb22f25be2573c1d37dafaf2b34d2d89e1c62
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 6d567e68d..884f16b4a 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:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list