diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2017-05-25 08:48:15 +0000 |
|---|---|---|
| committer | Jing Lu <lvjing5@huawei.com> | 2017-06-01 12:36:38 +0000 |
| commit | 9a372b8adf618981e4fbfb8d0cb3a48674c65d92 (patch) | |
| tree | 1f1bfe82e1854d576e109727afc88c9ab57ffd1c /yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py | |
| parent | ad3ff4cbaf92808801c9157d25416da6cff82666 (diff) | |
Imporve monitor_process pass criteria
JIRA: YARDSTICK-660
The monitor func()'s criteria in the monitor_process.py now is whether at least
one process of the specific controller node service is recovered. But in reality
is more resonable to use whether processes have been recoverd to it's original
amount. This patch is aiming at improving the isssue
Change-Id: I950ce2a89555801b96092735b0d670e892049927
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit 37921fcd232cd2fbba9f45ef9fa5d8c912f54af6)
Diffstat (limited to 'yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py index 8df2ea282..3386c5a1c 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py +++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py @@ -20,16 +20,18 @@ class MultiMonitor(basemonitor.BaseMonitor): __monitor_type__ = "multi-monitor" - def __init__(self, config, context): - super(MultiMonitor, self).__init__(config, context) + def __init__(self, config, context, data): + super(MultiMonitor, self).__init__(config, context, data) self.monitors = [] + self.monitor_data = data monitor_type = self._config["monitor_type"] monitor_cls = basemonitor.BaseMonitor.get_monitor_cls(monitor_type) monitor_number = self._config.get("monitor_number", 1) for i in range(monitor_number): - monitor_ins = monitor_cls(self._config, self._context) + monitor_ins = monitor_cls(self._config, self._context, + self.monitor_data) self.monitors.append(monitor_ins) def start_monitor(self): |