1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-03 20:02:39 +01:00

fw/target: fix signals reboot on unresponsive

- Add "hard" parameter to TargetManager's reboot().
- Pass in context to TargetManager's reboot() and
  verify_target_responsive() -- this is needed for signal dispatch.
- Call self.reboot() instead of self.target.reboot() when attempting a
  reset for unresponsive targets inside TargetManager, in order to
  ensure that appropriate signals are dispatched.
This commit is contained in:
Sergei Trofimov
2018-06-11 17:14:51 +01:00
committed by setrofim
parent e816980471
commit 2f99137ad5
3 changed files with 13 additions and 12 deletions

View File

@@ -74,9 +74,9 @@ class TargetManager(object):
def get_target_info(self):
return get_target_info(self.target)
def reboot(self):
with signal.wrap('REBOOT'):
self.target.reboot()
def reboot(self, context, hard=False):
with signal.wrap('REBOOT', self, context):
self.target.reboot(hard)
def merge_runtime_parameters(self, parameters):
return self.rpm.merge_runtime_parameters(parameters)
@@ -87,14 +87,15 @@ class TargetManager(object):
def commit_runtime_parameters(self, parameters):
self.rpm.commit_runtime_parameters(parameters)
def verify_target_responsive(self, can_reboot=True):
def verify_target_responsive(self, context):
can_reboot = context.reboot_policy.can_reboot
if not self.target.check_responsive(explode=False):
self.is_responsive = False
if not can_reboot:
raise TargetNotRespondingError('Target unresponsive and is not allowed to reboot.')
elif self.target.has('hard_reset'):
self.logger.info('Target unresponsive; performing hard reset')
self.target.reboot(hard=True)
self.reboot(context, hard=True)
self.is_responsive = True
raise ExecutionError('Target became unresponsive but was recovered.')
else: