jbwdevries/phasm-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prelude.log_bytes is now on the right thread

Browse Source 
Before, all messages would be logged on the prelude
container / thread.

routing log improvements
This commit is contained in:
Johan B.W. de Vries 2023-04-14 19:09:20 +02:00
parent 72ea5bd592
commit 5e1c5679e5
10 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/clickhouse/schema.sql
View File

@ -7,7 +7,6 @@ CREATE TABLE routing_logs
timestamp DateTime64(6, 'UTC'),
thread_id String,
from_container String,
from_method String,
to_service String,
to_container String,
to_method String,

2
examples/echoclient.py
View File

@ -8,5 +8,5 @@ def log_bytes(data: bytes) -> None:
@exported
def on_module_loaded() -> None:
log_bytes(b'on_module_loaded')
log_bytes(b'Echo client starting up, calling server')
log_bytes(echo(b'Hello, world!'))

1
examples/echoclient.toml
View File

@ -6,7 +6,6 @@ path = "examples/echoclient.wasm"
hash = "sha256@84cb22d12dfdd6b05cb906f6db83d59f473c9df85a33822f696344af2b92b502"
imports = [
{ service = "prelude", method = "log_bytes", arg_types = ["bytes"], return_type = "none"},
{ service = "echoserver", method = "echo", arg_types = ["bytes"], return_type = "bytes"},
]

2
examples/echoserver.py
View File

@ -8,4 +8,4 @@ def log_bytes(data: bytes) -> None:
@exported
def on_module_loaded() -> None:
log_bytes(b'on_module_loaded')
log_bytes(b'Echo service up and running')

4
examples/echoserver.toml
View File

@ -5,10 +5,6 @@ kind = "Image"
path = "examples/echoserver.wasm"
hash = "sha256@dfe03b4f7ce5e921931f8715384e35a6776fdc28837e42ffa04305bbadffcfc9"
imports = [
{ service = "prelude", method = "log_bytes", arg_types = ["bytes"], return_type = "none"}
]
[echoserver-container-0]
apiVersion = "v0"
kind = "Container"

5
phasmplatform/common/methodcall.py
View File

@ -94,10 +94,11 @@ MethodResultCallable = Callable[[Union[Value, MethodCallError]], None]
class RoutedMethodCall:
__slots__ = ('call', 'from_container', 'to_container', 'on_result', )
__slots__ = ('call', 'from_container', 'to_service', 'to_container', 'on_result', )
call: MethodCall
from_container: Optional[Container]
to_service: Optional[str]
to_container: Optional[Container]
on_result: MethodResultCallable
@ -105,11 +106,13 @@ class RoutedMethodCall:
self,
call: MethodCall,
from_container: Optional[Container],
to_service: Optional[str],
to_container: Optional[Container],
on_result: MethodResultCallable,
) -> None:
self.call = call
self.from_container = from_container
self.to_service = to_service
self.to_container = to_container
self.on_result = on_result

16
phasmplatform/worker/__main__.py
View File

@ -79,14 +79,14 @@ def container_thread(mcont: ManagedContainer) -> None:
settings={'session_id': clickhouse_session_id}
)
def routing_log(from_container: str, to_method: str, result: str) -> None:
def routing_log(from_container: str, to_service: Optional[str], to_method: str, result: str) -> None:
clickhouse_write.insert(
table='routing_logs',
data=[
[log_now(), str(id(mcont.thread)), from_container, mcont.container.name, to_method, result],
[log_now(), str(id(mcont.thread)), from_container, mcont.container.name, to_service or '', to_method, result],
],
column_names=['timestamp', 'thread_id', 'from_container', 'to_container', 'to_method', 'result'],
column_type_names=["DateTime64(6, 'UTC')", 'String', 'String', 'String', 'String', 'String'],
column_names=['timestamp', 'thread_id', 'from_container', 'to_container', 'to_service', 'to_method', 'result'],
column_type_names=["DateTime64(6, 'UTC')", 'String', 'String', 'String', 'String', 'String', 'String'],
settings={'session_id': clickhouse_session_id}
)
@ -94,9 +94,7 @@ def container_thread(mcont: ManagedContainer) -> None:
cls = RUNTIME_MAP.get(mcont.container.runtime)
assert cls is not None, f'Unknown runtime: {mcont.container.runtime}'
runtime: RunnerInterface = cls(mcont.method_call_router, mcont.container)
if isinstance(runtime, PreludeRunner):
runtime.set_config(mcont.config, container_log)
runtime: RunnerInterface = cls(mcont.method_call_router, mcont.container, container_log)
container_log('Starting thread')
@ -124,6 +122,7 @@ def container_thread(mcont: ManagedContainer) -> None:
routing_log(
call.from_container.name if call.from_container is not None else '[SYSTEM]',
call.to_service,
call.call.method.name,
repr(result.data) if isinstance(result, Value) else repr(result)
)
@ -171,6 +170,7 @@ class LocalhostMethodCallRouter(MethodCallRouterInterface):
to_mcont.queue.put(RoutedMethodCall(
call,
from_container,
service.name,
to_mcont.container,
on_result,
))
@ -247,7 +247,7 @@ def main() -> int:
)
for mcont in container_list:
mcont.queue.put(RoutedMethodCall(on_module_loaded, None, mcont.container, lambda x: None))
mcont.queue.put(RoutedMethodCall(on_module_loaded, None, None, mcont.container, lambda x: None))
try:
while 1:

8
phasmplatform/worker/runners/base.py
View File

@ -1,4 +1,4 @@
from typing import TextIO, Union
from typing import Callable, TextIO, Tuple, Union
from phasmplatform.common import valuetype
from phasmplatform.common.container import Container
@ -12,14 +12,16 @@ WasmValue = Union[None, int, float]
class RunnerInterface:
__slots__ = ('method_call_router', 'container', )
__slots__ = ('method_call_router', 'container', 'container_log', )
method_call_router: MethodCallRouterInterface
container: Container
container_log: Tuple[Callable[[str], None]] # Tuple for typing issues
def __init__(self, method_call_router: MethodCallRouterInterface, container: Container) -> None:
def __init__(self, method_call_router: MethodCallRouterInterface, container: Container, container_log: Callable[[str], None]) -> None:
self.method_call_router = method_call_router
self.container = container
self.container_log = (container_log, )
def do_call(self, call: MethodCall) -> Union[Value, MethodCallError]:
"""

16
phasmplatform/worker/runners/prelude.py
View File

@ -1,6 +1,5 @@
from typing import Callable, Union, Tuple
from typing import Union
from phasmplatform.common.config import WorkerConfig
from phasmplatform.common.methodcall import MethodCall, MethodCallError
from phasmplatform.common.value import Value, NoneValue
@ -8,22 +7,11 @@ from .base import BaseRunner
class PreludeRunner(BaseRunner):
__slots__ = ('config', 'container_log', )
config: WorkerConfig
container_log: Tuple[Callable[[str], None]] # Tuple for typing issues
def set_config(self, config: WorkerConfig, container_log: Callable[[str], None]) -> None:
self.config = config
self.container_log = (container_log, )
__slots__ = ()
def do_call(self, call: MethodCall) -> Union[Value, MethodCallError]:
if call.method.name == 'on_module_loaded':
self.container_log[0]('PreludeRunner loaded')
return NoneValue
if call.method.name == 'log_bytes':
self.container_log[0](f'LOG-BYTES: {repr(call.args[0].data)}')
return NoneValue
raise NotImplementedError(call)

17
phasmplatform/worker/runners/wasmtime.py
View File

@ -1,4 +1,4 @@
from typing import Any, Dict, List, Union
from typing import Any, Callable, Dict, List, Union
import ctypes
import functools
@ -21,8 +21,8 @@ from .base import BaseRunner, WasmValue
class WasmTimeRunner(BaseRunner):
__slots__ = ('store', 'module', 'instance', 'exports')
def __init__(self, method_call_router: MethodCallRouterInterface, container: Container) -> None:
super().__init__(method_call_router, container)
def __init__(self, method_call_router: MethodCallRouterInterface, container: Container, container_log: Callable[[str], None]) -> None:
super().__init__(method_call_router, container, container_log)
with open(f'./{container.image.path}', 'rb') as fil: # TODO: ImageLoader?
wasm_bin = fil.read()
@ -39,6 +39,12 @@ class WasmTimeRunner(BaseRunner):
for (imprt_service, imprt_method, ) in container.image.imports
}
import_map['prelude.log_bytes'] = wasmtime.Func(
self.store,
wasmtime.FuncType([wasmtime.ValType.i32()], []),
functools.partial(self.log_bytes),
)
# Make sure the given import lists order matches the one given by wasmtime
# Otherwise, wasmtime can't match them up.
imports: List[wasmtime.Func] = [
@ -125,6 +131,11 @@ class WasmTimeRunner(BaseRunner):
return self.value_to_wasm(value)
def log_bytes(self, data_ptr: int) -> None:
value = self.value_from_wasm(valuetype.bytes, data_ptr)
self.container_log[0](repr(value.data))
def build_func_type(method: Method) -> wasmtime.FuncType:
if method.return_type is valuetype.none: