daemon-common/benchmark.py

@@ -115,13 +115,12 @@ class BenchmarkError(Exception):
 #
 
 
-def cleanup(job_name, db_conn=None, db_cur=None, zkhandler=None, final=False):
+def cleanup(job_name, db_conn=None, db_cur=None, zkhandler=None):
     if db_conn is not None and db_cur is not None:
-        if not final:
-            # Clean up our dangling result (non-final runs only)
-            query = "DELETE FROM storage_benchmarks WHERE job = %s;"
-            args = (job_name,)
-            db_cur.execute(query, args)
+        # Clean up our dangling result
+        query = "DELETE FROM storage_benchmarks WHERE job = %s;"
+        args = (job_name,)
+        db_cur.execute(query, args)
         db_conn.commit()
         # Close the database connections cleanly
         close_database(db_conn, db_cur)
@@ -411,7 +410,6 @@ def worker_run_benchmark(zkhandler, celery, config, pool):
         db_conn=db_conn,
         db_cur=db_cur,
         zkhandler=zkhandler,
-        final=True,
     )
 
     current_stage += 1

daemon-common/node.py

@@ -158,9 +158,9 @@ def getNodeInformation(zkhandler, node_name):
         zkhandler, node_name, node_health_plugins
     )
 
-    try:
+    if _node_network_stats is not None:
         node_network_stats = json.loads(_node_network_stats)
-    except Exception:
+    else:
         node_network_stats = dict()
 
     # Construct a data structure to represent the data