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

Merge "Fix missing watcher_workflow_engines.taskflow section"

Browse Source
This commit is contained in:
Zuul
2025-08-26 13:16:19 +00:00
committed by Gerrit Code Review
parent 1668b9b9f8 1a87abc666
commit d91b550fc9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,9 +36,6 @@ from watcher.objects import fields
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
CANCEL_STATE = [objects.action_plan.State.CANCELLING,
objects.action_plan.State.CANCELLED]
class BaseWorkFlowEngine(loadable.Loadable, metaclass=abc.ABCMeta): class BaseWorkFlowEngine(loadable.Loadable, metaclass=abc.ABCMeta):
@@ -162,7 +159,7 @@ class BaseTaskFlowActionContainer(flow_task.Task):
# so that taskflow does not schedule further actions. # so that taskflow does not schedule further actions.
action_plan = objects.ActionPlan.get_by_id( action_plan = objects.ActionPlan.get_by_id(
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 objects.action_plan.State.CANCEL_STATES:
raise exception.ActionPlanCancelled(uuid=action_plan.uuid) raise exception.ActionPlanCancelled(uuid=action_plan.uuid)
if self._db_action.state == objects.action.State.SKIPPED: if self._db_action.state == objects.action.State.SKIPPED:
LOG.debug("Action %s is skipped manually", LOG.debug("Action %s is skipped manually",
@@ -245,7 +242,8 @@ class BaseTaskFlowActionContainer(flow_task.Task):
result = True result = True
if (action_object.state in [objects.action.State.SUCCEEDED, if (action_object.state in [objects.action.State.SUCCEEDED,
objects.action.State.FAILED] or objects.action.State.FAILED] or
action_plan_object.state in CANCEL_STATE): action_plan_object.state in
objects.action_plan.State.CANCEL_STATES):
break break
time.sleep(1) time.sleep(1)
try: try:
@@ -255,7 +253,9 @@ class BaseTaskFlowActionContainer(flow_task.Task):
# Not all actions support abort operations, kill only those action # Not all actions support abort operations, kill only those action
# which support abort operations # which support abort operations
abort = self.action.check_abort() abort = self.action.check_abort()
if (action_plan_object.state in CANCEL_STATE and abort): if (action_plan_object.state in
objects.action_plan.State.CANCEL_STATES and
abort):
et.kill() et.kill()
et.wait() et.wait()
return result return result
@@ -300,7 +300,7 @@ class BaseTaskFlowActionContainer(flow_task.Task):
# NOTE: check if revert cause by cancel action plan or # NOTE: check if revert cause by cancel action plan or
# some other exception occurred during action plan execution # some other exception occurred during action plan execution
# if due to some other exception keep the flow intact. # if due to some other exception keep the flow intact.
if action_plan.state not in CANCEL_STATE: if action_plan.state not in objects.action_plan.State.CANCEL_STATES:
self.do_revert() self.do_revert()
return return

2
watcher/objects/action_plan.py
View File

@@ -98,6 +98,8 @@ class State(object):
SUPERSEDED = 'SUPERSEDED' SUPERSEDED = 'SUPERSEDED'
CANCELLING = 'CANCELLING' CANCELLING = 'CANCELLING'
CANCEL_STATES = [CANCELLING, CANCELLED]
@base.WatcherObjectRegistry.register @base.WatcherObjectRegistry.register
class ActionPlan(base.WatcherPersistentObject, base.WatcherObject, class ActionPlan(base.WatcherPersistentObject, base.WatcherObject,