Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect action status in notifications"

Browse Source
This commit is contained in:
Jenkins
2017-08-07 07:21:08 +00:00
committed by Gerrit Code Review
parent 382f641b22 30def6f35b
commit f700ca4e0f
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
watcher/applier/workflow_engine/base.py
View File

@@ -90,6 +90,7 @@ class BaseWorkFlowEngine(loadable.Loadable):
eager=True) eager=True)
db_action.state = state db_action.state = state
db_action.save() db_action.save()
return db_action
@abc.abstractmethod @abc.abstractmethod
def execute(self, actions): def execute(self, actions):
@@ -149,9 +150,9 @@ class BaseTaskFlowActionContainer(flow_task.Task):
self.engine.context, self._db_action.action_plan_id) self.engine.context, self._db_action.action_plan_id)
if action_plan.state in CANCEL_STATE: if action_plan.state in CANCEL_STATE:
raise exception.ActionPlanCancelled(uuid=action_plan.uuid) raise exception.ActionPlanCancelled(uuid=action_plan.uuid)
self.do_pre_execute() db_action = self.do_pre_execute()
notifications.action.send_execution_notification( notifications.action.send_execution_notification(
self.engine.context, self._db_action, self.engine.context, db_action,
fields.NotificationAction.EXECUTION, fields.NotificationAction.EXECUTION,
fields.NotificationPhase.START) fields.NotificationPhase.START)
except exception.ActionPlanCancelled as e: except exception.ActionPlanCancelled as e:
@@ -159,9 +160,10 @@ class BaseTaskFlowActionContainer(flow_task.Task):
raise raise
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception(e)
self.engine.notify(self._db_action, objects.action.State.FAILED) db_action = self.engine.notify(self._db_action,
objects.action.State.FAILED)
notifications.action.send_execution_notification( notifications.action.send_execution_notification(
self.engine.context, self._db_action, self.engine.context, db_action,
fields.NotificationAction.EXECUTION, fields.NotificationAction.EXECUTION,
fields.NotificationPhase.ERROR, fields.NotificationPhase.ERROR,
priority=fields.NotificationPriority.ERROR) priority=fields.NotificationPriority.ERROR)
@@ -169,19 +171,19 @@ class BaseTaskFlowActionContainer(flow_task.Task):
def execute(self, *args, **kwargs): def execute(self, *args, **kwargs):
def _do_execute_action(*args, **kwargs): def _do_execute_action(*args, **kwargs):
try: try:
self.do_execute(*args, **kwargs) db_action = self.do_execute(*args, **kwargs)
notifications.action.send_execution_notification( notifications.action.send_execution_notification(
self.engine.context, self._db_action, self.engine.context, db_action,
fields.NotificationAction.EXECUTION, fields.NotificationAction.EXECUTION,
fields.NotificationPhase.END) fields.NotificationPhase.END)
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception(e)
LOG.error('The workflow engine has failed' LOG.error('The workflow engine has failed'
'to execute the action: %s', self.name) 'to execute the action: %s', self.name)
self.engine.notify(self._db_action, db_action = self.engine.notify(self._db_action,
objects.action.State.FAILED) objects.action.State.FAILED)
notifications.action.send_execution_notification( notifications.action.send_execution_notification(
self.engine.context, self._db_action, self.engine.context, db_action,
fields.NotificationAction.EXECUTION, fields.NotificationAction.EXECUTION,
fields.NotificationPhase.ERROR, fields.NotificationPhase.ERROR,
priority=fields.NotificationPriority.ERROR) priority=fields.NotificationPriority.ERROR)
@@ -227,9 +229,10 @@ class BaseTaskFlowActionContainer(flow_task.Task):
self.do_post_execute() self.do_post_execute()
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception(e)
self.engine.notify(self._db_action, objects.action.State.FAILED) db_action = self.engine.notify(self._db_action,
objects.action.State.FAILED)
notifications.action.send_execution_notification( notifications.action.send_execution_notification(
self.engine.context, self._db_action, self.engine.context, db_action,
fields.NotificationAction.EXECUTION, fields.NotificationAction.EXECUTION,
fields.NotificationPhase.ERROR, fields.NotificationPhase.ERROR,
priority=fields.NotificationPriority.ERROR) priority=fields.NotificationPriority.ERROR)

23
watcher/applier/workflow_engine/default.py
View File

@@ -111,9 +111,11 @@ class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
super(TaskFlowActionContainer, self).__init__(name, db_action, engine) super(TaskFlowActionContainer, self).__init__(name, db_action, engine)
def do_pre_execute(self): def do_pre_execute(self):
self.engine.notify(self._db_action, objects.action.State.ONGOING) db_action = self.engine.notify(self._db_action,
objects.action.State.ONGOING)
LOG.debug("Pre-condition action: %s", self.name) LOG.debug("Pre-condition action: %s", self.name)
self.action.pre_condition() self.action.pre_condition()
return db_action
def do_execute(self, *args, **kwargs): def do_execute(self, *args, **kwargs):
LOG.debug("Running action: %s", self.name) LOG.debug("Running action: %s", self.name)
@@ -121,11 +123,11 @@ class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
# NOTE: For result is False, set action state fail # NOTE: For result is False, set action state fail
result = self.action.execute() result = self.action.execute()
if result is False: if result is False:
self.engine.notify(self._db_action, return self.engine.notify(self._db_action,
objects.action.State.FAILED) objects.action.State.FAILED)
else: else:
self.engine.notify(self._db_action, return self.engine.notify(self._db_action,
objects.action.State.SUCCEEDED) objects.action.State.SUCCEEDED)
def do_post_execute(self): def do_post_execute(self):
LOG.debug("Post-condition action: %s", self.name) LOG.debug("Post-condition action: %s", self.name)
@@ -146,14 +148,15 @@ class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
result = self.action.abort() result = self.action.abort()
if result: if result:
# Aborted the action. # Aborted the action.
self.engine.notify(self._db_action, return self.engine.notify(self._db_action,
objects.action.State.CANCELLED) objects.action.State.CANCELLED)
else: else:
self.engine.notify(self._db_action, return self.engine.notify(self._db_action,
objects.action.State.SUCCEEDED) objects.action.State.SUCCEEDED)
except Exception as e: except Exception as e:
self.engine.notify(self._db_action, objects.action.State.FAILED)
LOG.exception(e) LOG.exception(e)
return self.engine.notify(self._db_action,
objects.action.State.FAILED)
class TaskFlowNop(flow_task.Task): class TaskFlowNop(flow_task.Task):