X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Frunners%2Fiteration.py;h=29daa0d42f5226433bfb6873d7bf9bb5adca4b3b;hb=07249e010dd9837d63f3090f1eac0fc6763b968f;hp=3a839b65fd0b5bc805c1e17d0708e42d9aad5e41;hpb=e12bcf0b3acdff1b483e0a7705c77acdee394c06;p=yardstick.git diff --git a/yardstick/benchmark/runners/iteration.py b/yardstick/benchmark/runners/iteration.py index 3a839b65f..29daa0d42 100644 --- a/yardstick/benchmark/runners/iteration.py +++ b/yardstick/benchmark/runners/iteration.py @@ -16,9 +16,10 @@ # yardstick comment: this is a modified copy of # rally/rally/benchmark/runners/constant.py -'''A runner that runs a configurable number of times before it returns -''' +"""A runner that runs a configurable number of times before it returns +""" +from __future__ import absolute_import import os import multiprocessing import logging @@ -40,6 +41,10 @@ def _worker_process(queue, cls, method_name, scenario_cfg, interval = runner_cfg.get("interval", 1) iterations = runner_cfg.get("iterations", 1) run_step = runner_cfg.get("run_step", "setup,run,teardown") + delta = runner_cfg.get("delta", 2) + options_cfg = scenario_cfg['options'] + initial_rate = options_cfg.get("rate", 100) + scenario_cfg['options']['rate'] = initial_rate LOG.info("worker START, iterations %d times, class %s", iterations, cls) runner_cfg['runner_id'] = os.getpid() @@ -76,6 +81,10 @@ def _worker_process(queue, cls, method_name, scenario_cfg, elif sla_action == "monitor": LOG.warning("SLA validation failed: %s", assertion.args) errors = assertion.args + elif sla_action == "rate-control": + scenario_cfg['options']['rate'] -= delta + sequence = 1 + continue except Exception as e: errors = traceback.format_exc() LOG.exception(e) @@ -109,7 +118,7 @@ def _worker_process(queue, cls, method_name, scenario_cfg, class IterationRunner(base.Runner): - '''Run a scenario for a configurable number of times + """Run a scenario for a configurable number of times If the scenario ends before the time has elapsed, it will be started again. @@ -122,7 +131,7 @@ If the scenario ends before the time has elapsed, it will be started again. type: int unit: seconds default: 1 sec - ''' + """ __execution_type__ = 'Iteration' def _run_benchmark(self, cls, method, scenario_cfg, context_cfg):