From c9a9dcae22045cb0392f8445d9d4e00753f934b5 Mon Sep 17 00:00:00 2001 From: rexlee8776 Date: Tue, 19 Jun 2018 10:40:20 +0000 Subject: Bugfix: HA kill process recovery has a conflict It happens in Nokia SUT when running in the Plugfest. The problem happens when the start_process start to recover the killed process (like nova-api), but the self-cured mechanism already recovered. And somehow it lead to a conflict and has problems. So the recover of the HA attack-recover should be improved to only recover it when it needs to. JIRA: YARDSTICK-1222 Change-Id: I1acb5a7d59d6fe4e0de0b0c5942fa89e051dd1ff Signed-off-by: rexlee8776 (cherry picked from commit 736f3fa5d52345d6fe5174b83de043f779fa0600) --- yardstick/benchmark/scenarios/availability/serviceha.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'yardstick/benchmark/scenarios') diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py index b6e840143..ee2eeb007 100755 --- a/yardstick/benchmark/scenarios/availability/serviceha.py +++ b/yardstick/benchmark/scenarios/availability/serviceha.py @@ -29,6 +29,7 @@ class ServiceHA(base.Scenario): self.context_cfg = context_cfg self.setup_done = False self.data = {} + self.sla_pass = False def setup(self): """scenario setup""" @@ -69,23 +70,25 @@ class ServiceHA(base.Scenario): self.monitorMgr.wait_monitors() LOG.info("Monitor '%s' stop!", self.__scenario_type__) - sla_pass = self.monitorMgr.verify_SLA() + self.sla_pass = self.monitorMgr.verify_SLA() for k, v in self.data.items(): if v == 0: - sla_pass = False + self.sla_pass = False LOG.info("The service process (%s) not found in the host environment", k) - result['sla_pass'] = 1 if sla_pass else 0 + result['sla_pass'] = 1 if self.sla_pass else 0 self.monitorMgr.store_result(result) - assert sla_pass is True, "The HA test case NOT pass the SLA" + assert self.sla_pass is True, "The HA test case NOT pass the SLA" return def teardown(self): """scenario teardown""" - for attacker in self.attackers: - attacker.recover() + # only recover when sla not pass + if not self.sla_pass: + for attacker in self.attackers: + attacker.recover() def _test(): # pragma: no cover -- cgit 1.2.3-korg