diff options
Diffstat (limited to 'storperf/test_executor.py')
| -rw-r--r-- | storperf/test_executor.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storperf/test_executor.py b/storperf/test_executor.py index aa8a415..c0ea295 100644 --- a/storperf/test_executor.py +++ b/storperf/test_executor.py @@ -9,7 +9,7 @@ from os import listdir from os.path import isfile, join -from storperf.carbon.converter import JSONToCarbon +from storperf.carbon.converter import Converter from storperf.carbon.emitter import CarbonMetricTransmitter from storperf.db.job_db import JobDB from storperf.fio.fio_invoker import FIOInvoker @@ -33,7 +33,7 @@ class TestExecutor(object): self.precondition = True self.warm = True self.event_listeners = set() - self.metrics_converter = JSONToCarbon() + self.metrics_converter = Converter() self.metrics_emitter = CarbonMetricTransmitter() self.prefix = None self.job_db = JobDB() @@ -58,7 +58,7 @@ class TestExecutor(object): self.event_listeners.discard(event_listener) def event(self, callback_id, metric): - carbon_metrics = self.metrics_converter.convert_to_dictionary( + carbon_metrics = self.metrics_converter.convert_json_to_flat( metric, callback_id) @@ -135,10 +135,10 @@ class TestExecutor(object): workload.filename = self.filename if (workload_name.startswith("_")): - iodepths = [2, ] + iodepths = [32, ] blocksizes = [8192, ] else: - iodepths = [1, 16, 128] + iodepths = [128, 16, 1] blocksizes = [8192, 4096, 512] workload.id = self.job_db.job_id @@ -183,6 +183,6 @@ class TestExecutor(object): self.logger.info("Ended " + workload.fullname) - def fetch_results(self, job, workload_name=""): + def fetch_workloads(self, job, workload_name=""): self.job_db.job_id = job - return self.job_db.fetch_results(workload_name) + return self.job_db.fetch_workloads(workload_name) |