Merge "standardize ssh auth"

[yardstick.git] / yardstick / benchmark / runners / iteration.py

diff --git a/yardstick/benchmark/runners/iteration.py b/yardstick/benchmark/runners/iteration.py
index c24957b..29daa0d 100644 (file)
--- a/yardstick/benchmark/runners/iteration.py
+++ b/yardstick/benchmark/runners/iteration.py
@@ -1,15 +1,25 @@
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+# Copyright 2014: Mirantis Inc.
+# All Rights Reserved.
 #
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+# 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
@@ -31,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()
@@ -51,7 +65,7 @@ def _worker_process(queue, cls, method_name, scenario_cfg,
     if "run" in run_step:
         while True:
 
-            LOG.debug("runner=%(runner)s seq=%(sequence)s START" %
+            LOG.debug("runner=%(runner)s seq=%(sequence)s START",
                       {"runner": runner_cfg["runner_id"],
                        "sequence": sequence})
 
@@ -65,8 +79,12 @@ def _worker_process(queue, cls, method_name, scenario_cfg,
                 if sla_action == "assert":
                     raise
                 elif sla_action == "monitor":
-                    LOG.warning("SLA validation failed: %s" % assertion.args)
+                    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)
@@ -85,7 +103,7 @@ def _worker_process(queue, cls, method_name, scenario_cfg,
 
             queue.put(record)
 
-            LOG.debug("runner=%(runner)s seq=%(sequence)s END" %
+            LOG.debug("runner=%(runner)s seq=%(sequence)s END",
                       {"runner": runner_cfg["runner_id"],
                        "sequence": sequence})
 
@@ -100,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.
 
@@ -113,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):