diff options
| -rw-r--r-- | docker/storperf-master/storperf/db/graphite_db.py | 2 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/test_executor.py | 5 |
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'] |