diff options
author | rexlee8776 <limingjiang@huawei.com> | 2019-01-22 03:34:30 +0000 |
---|---|---|
committer | Rex Lee <limingjiang@huawei.com> | 2019-01-24 01:41:05 +0000 |
commit | 4ed023a3e15cfb7029ee612e21252cabdc1974d2 (patch) | |
tree | 6ebf4d8aa9fa6fc631cd97b0ef9e466777c2aa2d /yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py | |
parent | a1e5634d35ba5f0095fdd2777efa4042b1872127 (diff) |
[dovetail] split the sla check results into process recovery and service
recovery for HA tcs
make sla check for process recovery optional: only check when sla is
set.
JIRA: YARDSTICK-1512
Change-Id: I717d39614a1af2ee9e62dec3b8a32d7d611f557e
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
(cherry picked from commit 39d89761aca4aaf724010a9f8cac73725b798b33)
Diffstat (limited to 'yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py')
-rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py index 971bae1e9..8f1f53cde 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py +++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py @@ -62,20 +62,19 @@ class MultiMonitor(basemonitor.BaseMonitor): outage_time = ( last_outage - first_outage if last_outage > first_outage else 0 ) + self._result = {"outage_time": outage_time} LOG.debug("outage_time is: %f", outage_time) max_outage_time = 0 - if "max_outage_time" in self._config["sla"]: - max_outage_time = self._config["sla"]["max_outage_time"] - elif "max_recover_time" in self._config["sla"]: - max_outage_time = self._config["sla"]["max_recover_time"] - else: - raise RuntimeError("'max_outage_time' or 'max_recover_time' " - "config is not found") - self._result = {"outage_time": outage_time} - - if outage_time > max_outage_time: - LOG.error("SLA failure: %f > %f", outage_time, max_outage_time) - return False - else: - return True + if self._config.get("sla"): + if "max_outage_time" in self._config["sla"]: + max_outage_time = self._config["sla"]["max_outage_time"] + elif "max_recover_time" in self._config["sla"]: + max_outage_time = self._config["sla"]["max_recover_time"] + else: + raise RuntimeError("'max_outage_time' or 'max_recover_time' " + "config is not found") + if outage_time > max_outage_time: + LOG.error("SLA failure: %f > %f", outage_time, max_outage_time) + return False + return True |