diff options
| author |   mbeierl <mark.beierl@dell.com> | 2017-01-20 16:05:24 -0500 |
|---|---|---|
| committer | mbeierl <mark.beierl@dell.com> | 2017-01-20 16:05:24 -0500 |
| commit | 29cab6cd9d6e669c74a1dd6960aba8250f539c2f (patch) | |
| tree | 2f45b65cb23ea50aca6543df1c7cf6fa9eec0fd6 /storperf/test_executor.py | |
| parent | 37773383c0ea27a934b9e97788e07276cbaaadcf (diff) | |
Fix multiple workload runs
Change reporting so that multiple workloads in one job execution can
be reported instead of overwriting the previous value.
Change the daily job to use a single, multiple workload run.
Change-Id: I8e350350ae13d2272b584af7a60ad269de160587
JIRA: STORPERF-98
Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'storperf/test_executor.py')
| -rw-r--r-- | storperf/test_executor.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storperf/test_executor.py b/storperf/test_executor.py index 9c9393f..cda6c78 100644 --- a/storperf/test_executor.py +++ b/storperf/test_executor.py @@ -177,9 +177,9 @@ class TestExecutor(object): def terminate(self): self._terminated = True self.end_time = time.time() - return self._terminate_current_run() + return self.terminate_current_run() - def _terminate_current_run(self): + def terminate_current_run(self): self.logger.info("Terminating current run") terminated_hosts = [] for workload in self._workload_executors: @@ -243,7 +243,7 @@ class TestExecutor(object): if self.deadline is not None \ and not workload_name.startswith("_"): event = scheduler.enter(self.deadline * 60, 1, - self._terminate_current_run, + self.terminate_current_run, ()) t = Thread(target=scheduler.run, args=()) t.start() |