diff options
author | Mark Beierl <mark.beierl@dell.com> | 2018-11-05 18:38:17 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-11-05 18:38:17 +0000 |
commit | c7842191ede010b05366204668cb3c80518461e5 (patch) | |
tree | 010c60e684d8b3f591d7af926caf899fb0994e94 /docker/storperf-master/storperf/workloads | |
parent | c46cd425bd8fd2c9b652a14d2e2400e3de644fbe (diff) | |
parent | bf29ec6e9a5f742d71e7d5cafe009b7223f46782 (diff) |
Merge "Add Stackless Support"
Diffstat (limited to 'docker/storperf-master/storperf/workloads')
-rw-r--r-- | docker/storperf-master/storperf/workloads/_base_workload.py | 17 | ||||
-rw-r--r-- | docker/storperf-master/storperf/workloads/_custom_workload.py | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/docker/storperf-master/storperf/workloads/_base_workload.py b/docker/storperf-master/storperf/workloads/_base_workload.py index 9b04314..7468fea 100644 --- a/docker/storperf-master/storperf/workloads/_base_workload.py +++ b/docker/storperf-master/storperf/workloads/_base_workload.py @@ -44,17 +44,24 @@ class _base_workload(object): self.options['size'] = "100%" self.logger.debug( "Profiling a device, using 100% of " + self.filename) + self.options['filename'] = self.filename else: - self.options['size'] = self.default_filesize + if 'size' not in self.options: + self.options['size'] = self.default_filesize self.logger.debug("Profiling a filesystem, using " + - self.default_filesize + " file") - - self.options['filename'] = self.filename + self.options['size'] + " file") + if not self.filename.endswith('/'): + self.filename = self.filename + "/" + self.options['directory'] = self.filename + self.options['filename_format'] = "'storperf.$jobnum.$filenum'" self.setup() for key, value in self.options.iteritems(): - args.append('--' + key + "=" + value) + if value is not None: + args.append('--' + key + "=" + str(value)) + else: + args.append('--' + key) if parse_only: args.append('--parse-only') diff --git a/docker/storperf-master/storperf/workloads/_custom_workload.py b/docker/storperf-master/storperf/workloads/_custom_workload.py index 9e0100d..5cd37b3 100644 --- a/docker/storperf-master/storperf/workloads/_custom_workload.py +++ b/docker/storperf-master/storperf/workloads/_custom_workload.py @@ -18,12 +18,12 @@ class _custom_workload(_base_workload._base_workload): self.default_filesize = "1G" self.filename = '/dev/vdb' self.fixed_options = { - 'loops': '200', 'output-format': 'json', 'status-interval': '60' } self.options = { 'ioengine': 'libaio', + 'loops': '200', 'direct': '1', 'numjobs': '1', 'rw': 'read', |