openstack/deb-mistral
Code Issues Proposed changes

Make sure the context is correctly passed through the rpc

Browse Source 
This adds a rpc context serializer to pass the context to the engine and
executor.

Change-Id: I6e76c7e28f475bb815f9184041bc8b848249d419
This commit is contained in:
Angus Salkeld 2014-06-19 16:22:20 +10:00
parent f814baae8c
commit 60d90e5660
6 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mistral/cmd/launch.py
View File

@ -40,6 +40,7 @@ from wsgiref import simple_server
from mistral.api import app
from mistral import config
from mistral import context
from mistral import engine
from mistral.engine import executor
from mistral.openstack.common import log as logging
@ -49,23 +50,27 @@ LOG = logging.getLogger(__name__)
def launch_executor(transport):
serializer = context.RpcContextSerializer(context.JsonPayloadSerializer())
target = messaging.Target(topic=cfg.CONF.executor.topic,
server=cfg.CONF.executor.host)
# Since engine and executor are tightly coupled, use the engine
# configuration to decide which executor to get.
endpoints = [executor.get_executor(cfg.CONF.engine.engine, transport)]
server = messaging.get_rpc_server(
transport, target, endpoints, executor='eventlet')
transport, target, endpoints, executor='eventlet',
serializer=serializer)
server.start()
server.wait()
def launch_engine(transport):
serializer = context.RpcContextSerializer(context.JsonPayloadSerializer())
target = messaging.Target(topic=cfg.CONF.engine.topic,
server=cfg.CONF.engine.host)
endpoints = [engine.get_engine(cfg.CONF.engine.engine, transport)]
server = messaging.get_rpc_server(
transport, target, endpoints, executor='eventlet')
transport, target, endpoints, executor='eventlet',
serializer=serializer)
server.start()
server.wait()

32
mistral/context.py
View File

@ -15,9 +15,11 @@
# limitations under the License.
import eventlet
from oslo import messaging
from pecan import hooks
from mistral import exceptions as exc
from mistral.openstack.common import jsonutils
from mistral.openstack.common import log as logging
from mistral import utils
@ -123,6 +125,36 @@ def context_from_headers(headers):
)
class JsonPayloadSerializer(messaging.NoOpSerializer):
@staticmethod
def serialize_entity(context, entity):
return jsonutils.to_primitive(entity, convert_instances=True)
class RpcContextSerializer(messaging.Serializer):
def __init__(self, base=None):
self._base = base or messaging.NoOpSerializer()
def serialize_entity(self, context, entity):
if not self._base:
return entity
return self._base.serialize_entity(context, entity)
def deserialize_entity(self, context, entity):
if not self._base:
return entity
return self._base.deserialize_entity(context, entity)
def serialize_context(self, context):
return context.to_dict()
def deserialize_context(self, context):
ctx = MistralContext(**context)
set_ctx(ctx)
return ctx
class ContextHook(hooks.PecanHook):
def before(self, state):
request_ctx = context_from_headers(state.request.headers)

20
mistral/engine/__init__.py
View File

@ -26,6 +26,7 @@ from stevedore import driver
# the submodules are referenced.
cfg.CONF.import_opt('workflow_trace_log_name', 'mistral.config')
from mistral import context as auth_context
from mistral.db import api as db_api
from mistral import dsl_parser as parser
from mistral.engine import data_flow
@ -71,7 +72,7 @@ class Engine(object):
and target task.
:param cntx: a request context dict
:type cntx: dict
:type cntx: MistralContext
:param kwargs: a dict of method arguments
:type kwargs: dict
:return: Workflow execution.
@ -387,7 +388,8 @@ class Engine(object):
retries, break_on, delay_sec = task_spec.get_retry_parameters()
if delay_sec > 0:
# Run the task after the specified delay.
eventlet.spawn_after(delay_sec, run_delayed_task)
eventlet.spawn_after(delay_sec, run_delayed_task,
context=auth_context.ctx())
else:
LOG.warn("No delay specified for task(id=%s) name=%s. Not "
"scheduling for execution." % (task['id'], task['name']))
@ -402,8 +404,11 @@ class EngineClient(object):
:param transport: a messaging transport handle
:type transport: Transport
"""
serializer = auth_context.RpcContextSerializer(
auth_context.JsonPayloadSerializer())
target = messaging.Target(topic=cfg.CONF.engine.topic)
self._client = messaging.RPCClient(transport, target)
self._client = messaging.RPCClient(transport, target,
serializer=serializer)
def start_workflow_execution(self, workbook_name, task_name, context=None):
"""Starts a workflow execution based on the specified workbook name
@ -414,8 +419,7 @@ class EngineClient(object):
:param context: Execution context which defines a workflow input
:return: Workflow execution.
"""
# TODO(m4dcoder): refactor auth context
cntx = {}
cntx = auth_context.ctx()
kwargs = {'workbook_name': workbook_name,
'task_name': task_name,
'context': context}
@ -465,8 +469,7 @@ class EngineClient(object):
:param execution_id: Workflow execution id.
:return: Current workflow state.
"""
# TODO(m4dcoder): refactor auth context
cntx = {}
cntx = auth_context.ctx()
kwargs = {'workbook_name': workbook_name,
'execution_id': execution_id}
return self._client.call(
@ -480,8 +483,7 @@ class EngineClient(object):
:param task_id: Task id.
:return: Current task state.
"""
# TODO(m4dcoder): refactor auth context
cntx = {}
cntx = auth_context.ctx()
kwargs = {'workbook_name': workbook_name,
'executioin_id': execution_id,
'task_id': task_id}

5
mistral/engine/drivers/default/engine.py
View File

@ -15,6 +15,7 @@
from oslo.config import cfg
from oslo import messaging
from mistral import context as auth_context
from mistral import engine
from mistral.engine import executor
from mistral.openstack.common import log as logging
@ -30,10 +31,8 @@ class DefaultEngine(engine.Engine):
self.transport = messaging.get_transport(cfg.CONF)
exctr = executor.ExecutorClient(self.transport)
for task in tasks:
# TODO(m4dcoder): Fill request context argument with auth info
context = {}
exctr.handle_task(context, task=task)
LOG.info("Submitted task for execution: '%s'" % task)
exctr.handle_task(auth_context.ctx(), task=task)
def _run_tasks(self, tasks):
# TODO(rakhmerov):

2
mistral/engine/drivers/default/executor.py
View File

@ -83,7 +83,7 @@ class DefaultExecutor(executor.Executor):
"""Handle the execution of the workbook task.
:param cntx: a request context dict
:type cntx: dict
:type cntx: MistralContext
:param kwargs: a dict of method arguments
:type kwargs: dict
"""

8
mistral/engine/executor.py
View File

@ -19,6 +19,7 @@ from oslo import messaging
import six
from stevedore import driver
from mistral import context as auth_context
from mistral import engine
from mistral.openstack.common import log as logging
@ -57,14 +58,17 @@ class ExecutorClient(object):
:param transport: a messaging transport handle
:type transport: Transport
"""
serializer = auth_context.RpcContextSerializer(
auth_context.JsonPayloadSerializer())
target = messaging.Target(topic=cfg.CONF.executor.topic)
self._client = messaging.RPCClient(transport, target)
self._client = messaging.RPCClient(transport, target,
serializer=serializer)
def handle_task(self, cntx, **kwargs):
"""Send the task request to the Executor for execution.
:param cntx: a request context dict
:type cntx: dict
:type cntx: MistralContext
:param kwargs: a dict of method arguments
:type kwargs: dict
"""