openstack
/
mistral
Code Issues Proposed changes

Merge "Make deafult executor use async messaging when returning action results"

This commit is contained in:
Jenkins 2016-10-17 13:32:03 +00:00 committed by Gerrit Code Review
parent ac2fb6cc34 ac486f2d20
commit 502e203ce3
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mistral/engine/base.py
View File

@ -56,7 +56,8 @@ class Engine(object):
raise NotImplementedError
@abc.abstractmethod
def on_action_complete(self, action_ex_id, result, wf_action=False):
def on_action_complete(self, action_ex_id, result, wf_action=False,
async=False):
"""Accepts action result and continues the workflow.
Action execution result here is a result which comes from an
@ -68,6 +69,8 @@ class Engine(object):
a workflow execution rather than action execution. It happens
when a nested workflow execution sends its result to a parent
workflow.
:param async: If True, run action in asynchronous mode (w/o waiting
for completion).
:return: Action(or workflow if wf_action=True) execution object.
"""
raise NotImplementedError

6
mistral/engine/default_executor.py
View File

@ -107,7 +107,11 @@ class DefaultExecutor(base.Executor, coordination.Service):
try:
if action_ex_id and (action.is_sync() or result.is_error()):
self._engine_client.on_action_complete(action_ex_id, result)
self._engine_client.on_action_complete(
action_ex_id,
result,
async=True
)
except Exception as e:
msg = ("Exception occurred when calling engine on_action_complete"

9
mistral/engine/rpc_backend/rpc.py
View File

@ -373,7 +373,8 @@ class EngineClient(base.Engine):
)
@wrap_messaging_exception
def on_action_complete(self, action_ex_id, result, wf_action=False):
def on_action_complete(self, action_ex_id, result, wf_action=False,
async=False):
"""Conveys action result to Mistral Engine.
This method should be used by clients of Mistral Engine to update
@ -391,10 +392,14 @@ class EngineClient(base.Engine):
a workflow execution rather than action execution. It happens
when a nested workflow execution sends its result to a parent
workflow.
:param async: If True, run action in asynchronous mode (w/o waiting
for completion).
:return: Action(or workflow if wf_action=True) execution object.
"""
return self._client.sync_call(
call = self._client.async_call if async else self._client.sync_call
return call(
auth_ctx.ctx(),
'on_action_complete',
action_ex_id=action_ex_id,