From 4dd55960919ee83018711a7f475db9ba205a698f Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Fri, 15 Mar 2019 00:47:38 -0400 Subject: [PATCH] Use default of 1 if no cores requested. refs #12026 Arvados-DCO-1.1-Signed-off-by: Tom Morris --- tools/crunchstat-summary/crunchstat_summary/summarizer.py | 4 +++- ...ainer_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report | 1 - .../tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report | 1 - .../tests/logfile_20151204190335.txt.gz.report | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py index 6d1fd918e4..96da98cdd9 100644 --- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py +++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py @@ -341,7 +341,9 @@ class Summarizer(object): # take average CPU usage into account as well or % time at max used_cores = max(1, int(math.ceil(cpu_max_rate))) asked_cores = self.existing_constraints.get(constraint_key) - if asked_cores is None or used_cores < asked_cores: + if asked_cores is None: + asked_cores = 1 + if used_cores < asked_cores: yield ( '#!! {} max CPU usage was {}% -- ' 'try runtime_constraints "{}":{}' diff --git a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report index b61da154ff..3f53126e63 100644 --- a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report +++ b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report @@ -23,5 +23,4 @@ time elapsed 20 - 20 # Max network speed in a single interval: 0.00MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% -#!! container max CPU usage was 24% -- try runtime_constraints "vcpus":1 #!! container max RSS was 67 MiB -- try runtime_constraints "ram":1020054732 diff --git a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report index 9d3cd78d3f..3b0d6a3f7b 100644 --- a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report +++ b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report @@ -34,5 +34,4 @@ time elapsed 20 - 20 # Max network speed in a single interval: 0.00MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% -#!! container max CPU usage was 24% -- try runtime_constraints "vcpus":1 #!! container max RSS was 67 MiB -- try runtime_constraints "ram":1020054732 diff --git a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report index f0a60957bb..eee7715196 100644 --- a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report +++ b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report @@ -31,5 +31,4 @@ time elapsed 80 - 80 # Max network speed in a single interval: 42.58MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% -#!! 4xphq-8i9sb-jq0ekny1xou3zoh max CPU usage was 13% -- try runtime_constraints "min_cores_per_node":1 #!! 4xphq-8i9sb-jq0ekny1xou3zoh max RSS was 334 MiB -- try runtime_constraints "min_ram_mb_per_node":972 -- 2.30.2