summaryrefslogtreecommitdiffstats
path: root/docker/storperf-master
diff options
context:
space:
mode:
Diffstat (limited to 'docker/storperf-master')
-rw-r--r--docker/storperf-master/rest_server.py2
-rw-r--r--docker/storperf-master/storperf/test_executor.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/storperf-master/rest_server.py b/docker/storperf-master/rest_server.py
index 1e61693..62b48cf 100644
--- 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
--- 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: