From 97d0125c038eb597289ba7138435cf789277e2f8 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 2 Jan 2019 18:41:35 -0700 Subject: [PATCH] Avoid crash in I/O Benchmark with small disks --- .bin/Scripts/functions/io_graph.py | 3 +++ .bin/Scripts/functions/osticket.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.bin/Scripts/functions/io_graph.py b/.bin/Scripts/functions/io_graph.py index 7a96d8aa..57048bfd 100644 --- a/.bin/Scripts/functions/io_graph.py +++ b/.bin/Scripts/functions/io_graph.py @@ -13,6 +13,9 @@ from functions.common import * def export_io_graph(disk): """Exports PNG graph using gnuplot, returns file path as str.""" read_rates = disk.tests['I/O Benchmark'].read_rates + if not read_rates: + # No data, aborting + raise GenericError max_rate = max(read_rates) / (1024**2) max_rate = max(800, max_rate) out_path = '{}/iobenchmark-{}.png'.format( diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index 3a1d20d7..ee26bca6 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -196,6 +196,9 @@ class osTicket(): # Create PNG graph try: graph_file = export_io_graph(dev) + except GenericError: + # No data to build graph, ignoring + pass except (AttributeError, KeyError): report.append('Failed to export graph') else: