Serve small fixes (#6539)

* Tmp db

* Lint

* Turn on direct call for serve tests
This commit is contained in:
Simon Mo
2019-12-18 23:08:59 -08:00
committed by GitHub
parent f78583147c
commit d807d0bab6
4 changed files with 13 additions and 7 deletions
+5 -1
View File
@@ -1,5 +1,6 @@
import inspect
from functools import wraps
from tempfile import mkstemp
import numpy as np
@@ -36,7 +37,7 @@ def _ensure_connected(f):
def init(kv_store_connector=None,
kv_store_path="/tmp/ray_serve.db",
kv_store_path=None,
blocking=False,
http_host=DEFAULT_HTTP_HOST,
http_port=DEFAULT_HTTP_PORT,
@@ -87,6 +88,9 @@ def init(kv_store_connector=None,
except ValueError:
pass
if kv_store_path is None:
_, kv_store_path = mkstemp()
# Serve has not been initialized, perform init sequence
# Todo, move the db to session_dir
# ray.worker._global_node.address_info["session_dir"]
+3 -3
View File
@@ -4,7 +4,7 @@ import json
import uvicorn
import ray
from ray.experimental.async_api import _async_init, as_future
from ray.experimental.async_api import _async_init
from ray.experimental.serve.constants import HTTP_ROUTER_CHECKER_INTERVAL_S
from ray.experimental.serve.context import TaskContext
from ray.experimental.serve.utils import BytesEncoder
@@ -148,7 +148,7 @@ class HTTPProxy:
await JSONResponse({"error": str(e)})(scope, receive, send)
return
result_object_id_bytes = await as_future(
result_object_id_bytes = await (
self.serve_global_state.init_or_get_router()
.enqueue_request.remote(
service=endpoint_name,
@@ -157,7 +157,7 @@ class HTTPProxy:
request_context=TaskContext.Web,
request_slo_ms=request_slo_ms))
result = await as_future(ray.ObjectID(result_object_id_bytes))
result = await ray.ObjectID(result_object_id_bytes)
if isinstance(result, ray.exceptions.RayTaskError):
await JSONResponse({
+3 -1
View File
@@ -1,3 +1,4 @@
import io
import time
import traceback
@@ -98,7 +99,8 @@ class RayServeMixin:
if work_item.request_context == TaskContext.Web:
serve_context.web = True
asgi_scope, body_bytes = work_item.request_args
flask_request = build_flask_request(asgi_scope, body_bytes)
flask_request = build_flask_request(asgi_scope,
io.BytesIO(body_bytes))
args = (flask_request, )
kwargs = {}
else: