diff options
Diffstat (limited to 'storperf/test_executor.py')
| -rw-r--r-- | storperf/test_executor.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/storperf/test_executor.py b/storperf/test_executor.py index 497d17c..aa8a415 100644 --- a/storperf/test_executor.py +++ b/storperf/test_executor.py @@ -38,6 +38,8 @@ class TestExecutor(object): self.prefix = None self.job_db = JobDB() self._slaves = [] + self._terminated = False + self._workload_executors = [] self._workload_thread = None @property @@ -118,7 +120,13 @@ class TestExecutor(object): self._workload_thread.start() return self.job_db.job_id + def terminate(self): + self._terminated = True + for workload in self._workload_executors: + workload.terminate() + def execute_workloads(self): + self._terminated = False for workload_module in self.workload_modules: workload_name = getattr(workload_module, "__name__") constructorMethod = getattr(workload_module, workload_name) @@ -137,6 +145,9 @@ class TestExecutor(object): for blocksize in blocksizes: for iodepth in iodepths: + if self._terminated: + return + workload.options['iodepth'] = str(iodepth) workload.options['bs'] = str(blocksize) @@ -144,6 +155,9 @@ class TestExecutor(object): for slave in self.slaves: slave_workload = copy.copy(workload) slave_workload.remote_host = slave + + self._workload_executors.append(slave_workload) + t = Thread(target=self.execute_on_node, args=(slave_workload,)) t.daemon = False @@ -153,6 +167,8 @@ class TestExecutor(object): for slave_thread in slave_threads: slave_thread.join() + self._workload_executors = [] + def execute_on_node(self, workload): invoker = FIOInvoker() |