fix java build failure (#6062)

This commit is contained in:
Zhijun Fu
2019-12-06 14:38:43 +08:00
committed by Hao Chen
parent 1c638a11a7
commit b88b8202cc
33 changed files with 251 additions and 378 deletions
+1 -1
View File
@@ -452,7 +452,7 @@ cdef deserialize_args(
c_args[i].get().GetMetadata()).to_pybytes()
== RAW_BUFFER_METADATA):
data = Buffer.make(c_args[i].get().GetData())
args.append(data)
args.append(data.to_pybytes())
elif (c_args[i].get().HasMetadata() and Buffer.make(
c_args[i].get().GetMetadata()).to_pybytes()
== PICKLE_BUFFER_METADATA):
+1 -1
View File
@@ -470,7 +470,7 @@ def stop(force, verbose):
debug_operator = "| tee /dev/stderr" if verbose else ""
command = (
"kill -s {} $(ps ax -o {} | grep {} | grep -v grep {} | grep ray |"
"kill -s {} $(ps ax -o {} | grep {} | grep -v grep {} |"
"awk '{{ print $1 }}') 2> /dev/null".format(
# ^^ This is how you escape braces in python format string.
"KILL" if force else "TERM",
+3
View File
@@ -1184,6 +1184,7 @@ def start_raylet(redis_address,
java_worker_command = build_java_worker_command(
java_worker_options,
redis_address,
node_manager_port,
plasma_store_name,
raylet_name,
redis_password,
@@ -1251,6 +1252,7 @@ def start_raylet(redis_address,
def build_java_worker_command(
java_worker_options,
redis_address,
node_manager_port,
plasma_store_name,
raylet_name,
redis_password,
@@ -1275,6 +1277,7 @@ def build_java_worker_command(
if redis_address is not None:
command += "-Dray.redis.address={} ".format(redis_address)
command += "-Dray.raylet.node-manager-port={} ".format(node_manager_port)
if plasma_store_name is not None:
command += (
+3 -1
View File
@@ -37,7 +37,9 @@ Attributes:
by 'functools.partial'.
"""
DUMMY_TYPE = "__RAY_DUMMY__"
# This dummy type is also defined in ArgumentsBuilder.java. Please keep it
# synced.
DUMMY_TYPE = b"__RAY_DUMMY__"
def get_signature(func):