From 7a42fbd26f8bf162fdee43b3cfff8950d57ed203 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Tue, 9 Jul 2019 14:04:41 -0400 Subject: [PATCH] Fix up test gold standard references for new output refs #13913 Arvados-DCO-1.1-Signed-off-by: Tom Morris --- tools/crunchstat-summary/crunchstat_summary/summarizer.py | 4 ++-- ...tainer_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report | 1 + ...ainer_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz.report | 4 +++- .../tests/container_9tee4-dz642-lymtndkpy39eibk.txt.gz.report | 2 ++ .../tests/logfile_20151204190335.txt.gz.report | 1 + .../tests/logfile_20151210063411.txt.gz.report | 1 + .../tests/logfile_20151210063439.txt.gz.report | 1 + tools/crunchstat-summary/tests/test_examples.py | 2 +- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py index 305042b2b0..e962ced314 100644 --- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py +++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py @@ -443,9 +443,9 @@ class Summarizer(object): def _recommend_temp_disk(self): """Recommend decreasing temp disk if utilization < 50%""" total = float(self.job_tot['statfs']['total']) - utilization = (float(self.job_tot['statfs']['used']) / total) + utilization = (float(self.job_tot['statfs']['used']) / total) if total > 0 else 0.0 - if utilization < 50.8: + if utilization < 50.8 and total > 0: yield ( '#!! {} max temp disk utilization was {:.0f}% of {:.0f} MiB -- ' 'consider reducing "tmpdirMin" and/or "outdirMin"' diff --git a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report index 0691e4f1ef..f77059b824 100644 --- a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report +++ b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report @@ -20,3 +20,4 @@ time elapsed 10 - 10 # Max network speed in a single interval: 0.00MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% +# Temp disk utilization 0.00% 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 c64c34c80e..b17c700593 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,4 +23,6 @@ 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 RSS was 67 MiB -- try reducing runtime_constraints to "ram":1020054732 +# Temp disk utilization 1.21% +#!! label #1 max RSS was 67 MiB -- try reducing runtime_constraints to "ram":1020054732 +#!! label #1 max temp disk utilization was 1% of 383960 MiB -- consider reducing "tmpdirMin" and/or "outdirMin" 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 3075c24b95..5152e577f5 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,4 +34,6 @@ 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% +# Temp disk utilization 1.21% #!! container max RSS was 67 MiB -- try reducing runtime_constraints to "ram":1020054732 +#!! container max temp disk utilization was 1% of 383960 MiB -- consider reducing "tmpdirMin" and/or "outdirMin" diff --git a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report index 5e3ad152f7..1fb56c7beb 100644 --- a/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report +++ b/tools/crunchstat-summary/tests/logfile_20151204190335.txt.gz.report @@ -31,4 +31,5 @@ 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% +# Temp disk utilization 0.00% #!! 4xphq-8i9sb-jq0ekny1xou3zoh max RSS was 334 MiB -- try reducing runtime_constraints to "min_ram_mb_per_node":972 diff --git a/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report b/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report index e260ca5bde..f567233fb7 100644 --- a/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report +++ b/tools/crunchstat-summary/tests/logfile_20151210063411.txt.gz.report @@ -20,4 +20,5 @@ time elapsed 2 - 4 # Max network speed in a single interval: 0.00MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% +# Temp disk utilization 0.00% #!! 4xphq-8i9sb-zvb2ocfycpomrup max RSS was 1 MiB -- try reducing runtime_constraints to "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 ffe1072250..ab0febbefa 100644 --- a/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report +++ b/tools/crunchstat-summary/tests/logfile_20151210063439.txt.gz.report @@ -20,4 +20,5 @@ time elapsed 2 - 3 # Max network speed in a single interval: 0.00MB/s # Keep cache miss rate 0.00% # Keep cache utilization 0.00% +# Temp disk utilization 0.00% #!! 4xphq-8i9sb-v831jm2uq0g2g9x max RSS was 1 MiB -- try reducing runtime_constraints to "min_ram_mb_per_node":972 diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py index 7603ea488c..0270eaaec0 100644 --- a/tools/crunchstat-summary/tests/test_examples.py +++ b/tools/crunchstat-summary/tests/test_examples.py @@ -102,7 +102,7 @@ class SummarizeContainer(ReportDiff): return UTF8Decode(gzip.open(self.arvmountlog)) mock_cr().open.side_effect = _open args = crunchstat_summary.command.ArgumentParser().parse_args( - ['--job', self.fake_request['uuid']]) + ['--container', self.fake_request['uuid']]) cmd = crunchstat_summary.command.Command(args) cmd.run() self.diff_known_report(self.reportfile, cmd) -- 2.30.2