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 'YARDSTICK-1250', 'YARDSTICK-1249'
[yardstick.git]
/
yardstick
/
benchmark
/
runners
/
arithmetic.py
diff --git
a/yardstick/benchmark/runners/arithmetic.py
b/yardstick/benchmark/runners/arithmetic.py
index
7898ae2
..
ecb59f9
100755
(executable)
--- a/
yardstick/benchmark/runners/arithmetic.py
+++ b/
yardstick/benchmark/runners/arithmetic.py
@@
-37,6
+37,7
@@
import six
from six.moves import range
from yardstick.benchmark.runners import base
from six.moves import range
from yardstick.benchmark.runners import base
+from yardstick.common import exceptions as y_exc
LOG = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
@@
-86,7
+87,7
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
loop_iter = six.moves.zip(*param_iters)
else:
LOG.warning("iter_type unrecognized: %s", iter_type)
loop_iter = six.moves.zip(*param_iters)
else:
LOG.warning("iter_type unrecognized: %s", iter_type)
- raise TypeError("iter_type unrecognized: %s"
,
iter_type)
+ raise TypeError("iter_type unrecognized: %s"
%
iter_type)
# Populate options and run the requested method for each value combination
for comb_values in loop_iter:
# Populate options and run the requested method for each value combination
for comb_values in loop_iter:
@@
-105,14
+106,14
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
try:
result = method(data)
try:
result = method(data)
- except
AssertionError as assertion
:
+ except
y_exc.SLAValidationError as error
:
# SLA validation failed in scenario, determine what to do now
if sla_action == "assert":
raise
elif sla_action == "monitor":
# SLA validation failed in scenario, determine what to do now
if sla_action == "assert":
raise
elif sla_action == "monitor":
- LOG.warning("SLA validation failed: %s",
assertion
.args)
- errors =
assertion
.args
- except Exception as e:
+ LOG.warning("SLA validation failed: %s",
error
.args)
+ errors =
error
.args
+ except Exception as e:
# pylint: disable=broad-except
errors = traceback.format_exc()
LOG.exception(e)
else:
errors = traceback.format_exc()
LOG.exception(e)
else:
@@
-138,8
+139,18
@@
def _worker_process(queue, cls, method_name, scenario_cfg,
if errors and sla_action is None:
break
if errors and sla_action is None:
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 ArithmeticRunner(base.Runner):
class ArithmeticRunner(base.Runner):
@@
-181,7
+192,9
@@
class ArithmeticRunner(base.Runner):
__execution_type__ = 'Arithmetic'
def _run_benchmark(self, cls, method, scenario_cfg, context_cfg):
__execution_type__ = 'Arithmetic'
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,
context_cfg, self.aborted, self.output_queue))
target=_worker_process,
args=(self.result_queue, cls, method, scenario_cfg,
context_cfg, self.aborted, self.output_queue))