Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topics 'feat/keep_vnf', 'YARDSTICK-886'
[yardstick.git]
/
yardstick
/
benchmark
/
runners
/
sequence.py
diff --git
a/yardstick/benchmark/runners/sequence.py
b/yardstick/benchmark/runners/sequence.py
index
af87c00
..
d6e3f71
100644
(file)
--- a/
yardstick/benchmark/runners/sequence.py
+++ b/
yardstick/benchmark/runners/sequence.py
@@
-21,11
+21,13
@@
The input value in the sequence is specified in a list in the input file.
"""
from __future__ import absolute_import
"""
from __future__ import absolute_import
-import os
-import multiprocessing
+
import logging
import logging
-import
traceback
+import
multiprocessing
import time
import time
+import traceback
+
+import os
from yardstick.benchmark.runners import base
from yardstick.benchmark.runners import base
@@
-33,7
+35,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
+59,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
+73,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
+84,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
+97,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})
@@
-109,8
+107,18
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
if (errors and sla_action is None) or aborted.is_set():
break
if (errors and sla_action is None) or aborted.is_set():
break
- benchmark.teardown()
+ try:
+ benchmark.teardown()
+ except Exception:
+ # catch any exception in teardown and convert to simple exception
+ # never pass exceptions back to multiprocessing, because some exceptions can
+ # be unpicklable
+ # https://bugs.python.org/issue9400
+ LOG.exception("")
+ raise SystemExit(1)
LOG.info("worker END")
LOG.info("worker END")
+ LOG.debug("queue.qsize() = %s", queue.qsize())
+ LOG.debug("output_queue.qsize() = %s", output_queue.qsize())
class SequenceRunner(base.Runner):
class SequenceRunner(base.Runner):
@@
-134,8
+142,10
@@
class SequenceRunner(base.Runner):
__execution_type__ = 'Sequence'
def _run_benchmark(self, cls, method, scenario_cfg, context_cfg):
__execution_type__ = 'Sequence'
def _run_benchmark(self, cls, method, scenario_cfg, context_cfg):
+ name = "{}-{}-{}".format(self.__execution_type__, scenario_cfg.get("type"), os.getpid())
self.process = multiprocessing.Process(
self.process = multiprocessing.Process(
+ name=name,
target=_worker_process,
args=(self.result_queue, cls, method, scenario_cfg,
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()