diff options
author | mbeierl <mark.beierl@dell.com> | 2017-10-17 22:41:55 -0400 |
---|---|---|
committer | Mark Beierl <mark.beierl@dell.com> | 2017-10-18 03:01:29 +0000 |
commit | 7cafd2b79cf1d83c9bddb6b7c686b693ad84a5e4 (patch) | |
tree | 19b211263b8f03777eedd6675b7c0289bc9767a1 /docker/storperf-master/storperf | |
parent | c7c303ecc18fd1d7b92b60db5eaca42f67e6204c (diff) |
Improving Reporting
Changes IOPS and BW to summation vs. average.
Adds fixed 0 y axis to all graphs
Change-Id: I3379597bda04b030424a25c7309a02c982fdb706
Signed-off-by: mbeierl <mark.beierl@dell.com>
(cherry picked from commit 31b0e130755cbd425b26f740e5701768d77f98f0)
Diffstat (limited to 'docker/storperf-master/storperf')
4 files changed, 14 insertions, 12 deletions
diff --git a/docker/storperf-master/storperf/db/graphite_db.py b/docker/storperf-master/storperf/db/graphite_db.py index aa71855..8ebd22e 100644 --- a/docker/storperf-master/storperf/db/graphite_db.py +++ b/docker/storperf-master/storperf/db/graphite_db.py @@ -33,19 +33,20 @@ class GraphiteDB(object): return result - def fetch_series(self, workload, metric, io_type, time, duration): + def fetch_series(self, function, workload, metric, + io_type, time, duration): series = [] end = time start = end - duration request = ("http://%s:%s/graphite/render/?target=" - "averageSeries(%s.*.jobs.1.%s.%s)" + "%s(%s.*.jobs.1.%s.%s)" "&format=json" "&from=%s" "&until=%s" % (self.graphite_host, self.graphite_port, - workload, io_type, metric, + function, workload, io_type, metric, start, end)) self.logger.debug("Calling %s" % (request)) diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index ef9ace3..c84a02c 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -422,11 +422,6 @@ class StorPerfMaster(object): metadata = self.fetch_metadata(job) if 'report' in metadata: metadata['report']['_id'] = job - metadata['report']['start_date'] = \ - metadata['report']['start_time'] - metadata['report']['end_date'] = \ - metadata['report']['end_time'] - metadata['report']['_id'] = job job_report['results'].append(metadata['report']) return job_report diff --git a/docker/storperf-master/storperf/utilities/data_handler.py b/docker/storperf-master/storperf/utilities/data_handler.py index 8a69180..b85517f 100644 --- a/docker/storperf-master/storperf/utilities/data_handler.py +++ b/docker/storperf-master/storperf/utilities/data_handler.py @@ -43,7 +43,12 @@ class DataHandler(object): for io_type in ('read', 'write'): metrics[metric][io_type] = {} - series = self._lookup_prior_data(executor, metric, io_type) + function = "sumSeries" + if 'mean' in metric: + function = "averageSeries" + + series = self._lookup_prior_data(executor, metric, io_type, + function) series = self._convert_timestamps_to_samples( executor, series) steady = self._evaluate_prior_data( @@ -85,7 +90,7 @@ class DataHandler(object): if steady_state and not workload_name.startswith('_'): executor.terminate_current_run() - def _lookup_prior_data(self, executor, metric, io_type): + def _lookup_prior_data(self, executor, metric, io_type, function): workload = executor.current_workload graphite_db = GraphiteDB() @@ -93,7 +98,8 @@ class DataHandler(object): # data we just sent to it now = int(time.time()) backtime = 60 * (executor.steady_state_samples + 1) - data_series = graphite_db.fetch_series(workload, + data_series = graphite_db.fetch_series(function, + workload, metric, io_type, now, diff --git a/docker/storperf-master/storperf/workloads/_base_workload.py b/docker/storperf-master/storperf/workloads/_base_workload.py index c045278..d5282d7 100644 --- a/docker/storperf-master/storperf/workloads/_base_workload.py +++ b/docker/storperf-master/storperf/workloads/_base_workload.py @@ -23,7 +23,7 @@ class _base_workload(object): 'bs': '64k', 'iodepth': '1', 'numjobs': '1', - 'loops': '20', + 'loops': '200', 'output-format': 'json', 'status-interval': '60' } |