Tiding up post run

Sometimes extra slave IPs are left behind in memory
and deleting a job shows multiples of the same IP
being cancelled.

Change-Id: I7a1bd2f327a46a89fcb3df7e25356c946afb8262
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/docker/storperf-master/rest_server.py b/docker/storperf-master/rest_server.py
index 1e61693..62b48cf 100644 (file)
--- a/docker/storperf-master/rest_server.py
+++ b/docker/storperf-master/rest_server.py
@@ -459,6 +459,8 @@ for any single test iteration.
                 storperf.block_sizes = request.json['block_sizes']
             storperf.workloads = None
             storperf.custom_workloads = None
+            if ('workload' in request.json):
+                storperf.workloads = request.json['workload']
             if ('workloads' in request.json):
                 storperf.custom_workloads = request.json['workloads']
             if ('metadata' in request.json):

diff --git a/docker/storperf-master/storperf/test_executor.py b/docker/storperf-master/storperf/test_executor.py
index 0ab5698..7853375 100644 (file)
--- a/docker/storperf-master/storperf/test_executor.py
+++ b/docker/storperf-master/storperf/test_executor.py
@@ -267,6 +267,7 @@ class TestExecutor(object):
         thread_pool = ThreadPool(processes=len(self.slaves) *
                                  self.volume_count)
 
+        self._workload_executors = []
         for slave in self.slaves:
             volume_number = 0
             while volume_number < self.volume_count: