summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2018-10-15 15:34:17 -0400
committermbeierl <mark.beierl@dell.com>2018-10-15 15:34:17 -0400
commit790e601173040de7c5224b7ac81b8c78cd5d77c9 (patch)
treedcc14465498b18b73172499fee590f4c6655fb87
parent4aba838a07f5cd7dbd6d606c34f688e647a5d890 (diff)
Proper Job MetricsHEADmaster
Uses all FIO jobs, not just job.1 when calculating metrics. Fixes bug when multiple volumes are created, but thread gate is not big enough. Change-Id: I473b2d19848c6ebc15e7669d84fade52d10fb97d JIRA: STORPERF-263 Signed-off-by: mbeierl <mark.beierl@dell.com>
-rw-r--r--docker/storperf-master/storperf/db/graphite_db.py2
-rw-r--r--docker/storperf-master/storperf/test_executor.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/storperf-master/storperf/db/graphite_db.py b/docker/storperf-master/storperf/db/graphite_db.py
index 8ebd22e..59b9f5d 100644
--- a/docker/storperf-master/storperf/db/graphite_db.py
+++ b/docker/storperf-master/storperf/db/graphite_db.py
@@ -41,7 +41,7 @@ class GraphiteDB(object):
start = end - duration
request = ("http://%s:%s/graphite/render/?target="
- "%s(%s.*.jobs.1.%s.%s)"
+ "%s(%s.*.jobs.*.%s.%s)"
"&format=json"
"&from=%s"
"&until=%s"
diff --git a/docker/storperf-master/storperf/test_executor.py b/docker/storperf-master/storperf/test_executor.py
index f7b577e..53832b4 100644
--- a/docker/storperf-master/storperf/test_executor.py
+++ b/docker/storperf-master/storperf/test_executor.py
@@ -315,8 +315,9 @@ class TestExecutor(object):
continue
workload = current_workload['workload']
- self._thread_gate = ThreadGate(len(self.slaves),
- workload.options['status-interval'])
+ self._thread_gate = ThreadGate(
+ len(self.slaves) * min(1, self.volume_count),
+ workload.options['status-interval'])
self.current_workload = current_workload['name']