8341: Update test results.

diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index 1a6a41cc118945c8d1af44cbaf3c77dddba8b68e..5caf83472f84f28b1a48e68cb68a30083058076d 100644 (file)
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -258,7 +258,7 @@ class Summarizer(object):
         if cpu_max_rate == float('-Inf'):
             logger.warning('%s: no CPU usage data', self.label)
             return
-        used_cores = int(math.ceil(cpu_max_rate))
+        used_cores = max(1, int(math.ceil(cpu_max_rate)))
         asked_cores = self.existing_constraints.get('min_cores_per_node')
         if asked_cores is None or used_cores < asked_cores:
             yield (

diff --git a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report
index 0ba0181c1215620c7f0a4334c2eb77dc3d64d7a6..e531e4b475f6aec5f7f4ce300db2b056f5db70a6 100644 (file)
--- a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report
+++ b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report
@@ -1,16 +1,16 @@
 category       metric  task_max        task_max_rate   job_total
-blkio:0:0      read    0       0.00    0
-blkio:0:0      write   0       0.00    0
+blkio:0:0      read    0       0       0
+blkio:0:0      write   0       0       0
 cpu    cpus    8       -       -
 cpu    sys     1.92    0.04    1.92
 cpu    user    3.83    0.09    3.83
 cpu    user+sys        5.75    0.13    5.75
-fuseops        read    0       0.00    0
-fuseops        write   0       0.00    0
-keepcache      hit     0       0.00    0
-keepcache      miss    0       0.00    0
-keepcalls      get     0       0.00    0
-keepcalls      put     0       0.00    0
+fuseops        read    0       0       0
+fuseops        write   0       0       0
+keepcache      hit     0       0       0
+keepcache      miss    0       0       0
+keepcalls      get     0       0       0
+keepcalls      put     0       0       0
 mem    cache   1678139392      -       -
 mem    pgmajfault      0       -       0
 mem    rss     349814784       -       -
@@ -18,9 +18,9 @@ mem   swap    0       -       -
 net:eth0       rx      1754364530      41658344.87     1754364530
 net:eth0       tx      38837956        920817.97       38837956
 net:eth0       tx+rx   1793202486      42579162.83     1793202486
-net:keep0      rx      0       0.00    0
-net:keep0      tx      0       0.00    0
-net:keep0      tx+rx   0       0.00    0
+net:keep0      rx      0       0       0
+net:keep0      tx      0       0       0
+net:keep0      tx+rx   0       0       0
 time   elapsed 80      -       80
 # Number of tasks: 1
 # Max CPU time spent by a single task: 5.75s

diff --git a/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report
index 0641bbac9f6c4f88c008adb279440e88be4f628a..ac7c0a785adb409ffdcadf182b86bf760bfa7438 100644 (file)
--- a/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report
+++ b/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report
@@ -1,8 +1,8 @@
 category       metric  task_max        task_max_rate   job_total
 cpu    cpus    8       -       -
-cpu    sys     0.00    -       0.00
-cpu    user    0.00    -       0.00
-cpu    user+sys        0.00    -       0.00
+cpu    sys     0       -       0.00
+cpu    user    0       -       0.00
+cpu    user+sys        0       -       0.00
 mem    cache   12288   -       -
 mem    pgmajfault      0       -       0
 mem    rss     856064  -       -
@@ -12,8 +12,11 @@ net:eth0     tx      90      -       90
 net:eth0       tx+rx   180     -       180
 time   elapsed 2       -       4
 # Number of tasks: 2
-# Max CPU time spent by a single task: 0.00s
+# Max CPU time spent by a single task: 0s
+# Max CPU usage in a single interval: 0%
 # Overall CPU usage: 0.00%
 # Max memory used by a single task: 0.00GB
 # Max network traffic in a single task: 0.00GB
+# Max network speed in a single interval: 0.00MB/s
+#!! 4xphq-8i9sb-zvb2ocfycpomrup max CPU usage was 0% -- try runtime_constraints "min_cores_per_node":1
 #!! 4xphq-8i9sb-zvb2ocfycpomrup max RSS was 1 MiB -- try runtime_constraints "min_ram_mb_per_node":972

diff --git a/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report
index 19fe0ed764d4fc2c229c348161c0079d9d67b1dd..6b4240cba8263065d28a00c536fcaaac44420d21 100644 (file)
--- a/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report
+++ b/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report
@@ -1,8 +1,8 @@
 category       metric  task_max        task_max_rate   job_total
 cpu    cpus    8       -       -
-cpu    sys     0.00    -       0.00
-cpu    user    0.00    -       0.00
-cpu    user+sys        0.00    -       0.00
+cpu    sys     0       -       0.00
+cpu    user    0       -       0.00
+cpu    user+sys        0       -       0.00
 mem    cache   8192    -       -
 mem    pgmajfault      0       -       0
 mem    rss     450560  -       -
@@ -12,8 +12,11 @@ net:eth0     tx      90      -       90
 net:eth0       tx+rx   180     -       180
 time   elapsed 2       -       3
 # Number of tasks: 2
-# Max CPU time spent by a single task: 0.00s
+# Max CPU time spent by a single task: 0s
+# Max CPU usage in a single interval: 0%
 # Overall CPU usage: 0.00%
 # Max memory used by a single task: 0.00GB
 # Max network traffic in a single task: 0.00GB
+# Max network speed in a single interval: 0.00MB/s
+#!! 4xphq-8i9sb-v831jm2uq0g2g9x max CPU usage was 0% -- try runtime_constraints "min_cores_per_node":1
 #!! 4xphq-8i9sb-v831jm2uq0g2g9x max RSS was 1 MiB -- try runtime_constraints "min_ram_mb_per_node":972