openstack
/
mistral
Code Issues Proposed changes

Merge "Delete delayed calls for deleted entities"

This commit is contained in:
Zuul 2019-06-10 12:33:31 +00:00 committed by Gerrit Code Review
parent 1e83a07696 475b82c532
commit 3b37eea14b
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mistral/engine/policies.py
View File

@ -525,7 +525,9 @@ def _continue_task(task_ex_id):
from mistral.engine import task_handler
with db_api.transaction():
task_handler.continue_task(db_api.get_task_execution(task_ex_id))
task_ex = db_api.load_task_execution(task_ex_id)
task_handler.continue_task(task_ex)
@db_utils.retry_on_db_error
@ -534,7 +536,7 @@ def _complete_task(task_ex_id, state, state_info):
from mistral.engine import task_handler
with db_api.transaction():
task_ex = db_api.get_task_execution(task_ex_id)
task_ex = db_api.load_task_execution(task_ex_id)
task_handler.complete_task(task_ex, state, state_info)
@ -545,7 +547,7 @@ def _fail_task_if_incomplete(task_ex_id, timeout):
from mistral.engine import task_handler
with db_api.transaction():
task_ex = db_api.get_task_execution(task_ex_id)
task_ex = db_api.load_task_execution(task_ex_id)
if not states.is_completed(task_ex.state):
msg = 'Task timed out [timeout(s)=%s].' % timeout

20
mistral/engine/task_handler.py
View File

@ -214,6 +214,9 @@ def force_fail_task(task_ex, msg, task=None):
def continue_task(task_ex):
if not task_ex:
return
wf_spec = spec_parser.get_workflow_spec_by_execution_id(
task_ex.workflow_execution_id
)
@ -240,6 +243,9 @@ def continue_task(task_ex):
def complete_task(task_ex, state, state_info):
if not task_ex:
return
wf_spec = spec_parser.get_workflow_spec_by_execution_id(
task_ex.workflow_execution_id
)
@ -476,11 +482,12 @@ def _get_refresh_state_job_key(task_ex_id):
def _scheduled_on_action_complete(action_ex_id, wf_action):
with db_api.transaction():
if wf_action:
action_ex = db_api.get_workflow_execution(action_ex_id)
action_ex = db_api.load_workflow_execution(action_ex_id)
else:
action_ex = db_api.get_action_execution(action_ex_id)
action_ex = db_api.load_action_execution(action_ex_id)
_on_action_complete(action_ex)
if action_ex:
_on_action_complete(action_ex)
def schedule_on_action_complete(action_ex, delay=0):
@ -522,11 +529,12 @@ def schedule_on_action_complete(action_ex, delay=0):
def _scheduled_on_action_update(action_ex_id, wf_action):
with db_api.transaction():
if wf_action:
action_ex = db_api.get_workflow_execution(action_ex_id)
action_ex = db_api.load_workflow_execution(action_ex_id)
else:
action_ex = db_api.get_action_execution(action_ex_id)
action_ex = db_api.load_action_execution(action_ex_id)
_on_action_update(action_ex)
if action_ex:
_on_action_update(action_ex)
def schedule_on_action_update(action_ex, delay=0):