Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Set TEST_DB_URL for storperf
[yardstick.git]
/
yardstick
/
benchmark
/
runners
/
sequence.py
diff --git
a/yardstick/benchmark/runners/sequence.py
b/yardstick/benchmark/runners/sequence.py
index
af87c00
..
68e272c
100644
(file)
--- a/
yardstick/benchmark/runners/sequence.py
+++ b/
yardstick/benchmark/runners/sequence.py
@@
-33,7
+33,7
@@
LOG = logging.getLogger(__name__)
def _worker_process(queue, cls, method_name, scenario_cfg,
def _worker_process(queue, cls, method_name, scenario_cfg,
- context_cfg, aborted):
+ context_cfg, aborted
, output_queue
):
sequence = 1
sequence = 1
@@
-57,10
+57,6
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
benchmark.setup()
method = getattr(benchmark, method_name)
benchmark.setup()
method = getattr(benchmark, method_name)
- queue.put({'runner_id': runner_cfg['runner_id'],
- 'scenario_cfg': scenario_cfg,
- 'context_cfg': context_cfg})
-
sla_action = None
if "sla" in scenario_cfg:
sla_action = scenario_cfg["sla"].get("action", "assert")
sla_action = None
if "sla" in scenario_cfg:
sla_action = scenario_cfg["sla"].get("action", "assert")
@@
-75,7
+71,7
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
errors = ""
try:
errors = ""
try:
- method(data)
+
result =
method(data)
except AssertionError as assertion:
# SLA validation failed in scenario, determine what to do now
if sla_action == "assert":
except AssertionError as assertion:
# SLA validation failed in scenario, determine what to do now
if sla_action == "assert":
@@
-86,6
+82,9
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
except Exception as e:
errors = traceback.format_exc()
LOG.exception(e)
except Exception as e:
errors = traceback.format_exc()
LOG.exception(e)
+ else:
+ if result:
+ output_queue.put(result)
time.sleep(interval)
time.sleep(interval)
@@
-96,10
+95,7
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
'errors': errors
}
'errors': errors
}
- record = {'runner_id': runner_cfg['runner_id'],
- 'benchmark': benchmark_output}
-
- queue.put(record)
+ queue.put(benchmark_output)
LOG.debug("runner=%(runner)s seq=%(sequence)s END",
{"runner": runner_cfg["runner_id"], "sequence": sequence})
LOG.debug("runner=%(runner)s seq=%(sequence)s END",
{"runner": runner_cfg["runner_id"], "sequence": sequence})
@@
-137,5
+133,5
@@
class SequenceRunner(base.Runner):
self.process = multiprocessing.Process(
target=_worker_process,
args=(self.result_queue, cls, method, scenario_cfg,
self.process = multiprocessing.Process(
target=_worker_process,
args=(self.result_queue, cls, method, scenario_cfg,
- context_cfg, self.aborted))
+ context_cfg, self.aborted
, self.output_queue
))
self.process.start()
self.process.start()