From dfcb9c356e2f691e3a6fd1f9d85b7d3e8cecdfd9 Mon Sep 17 00:00:00 2001 From: burglarralgrub Date: Wed, 10 Mar 2021 10:49:31 +0800 Subject: [PATCH] Remove the `--java-worker-options` parameter (#14563) --- python/ray/_private/services.py | 24 +----------------------- python/ray/node.py | 1 - python/ray/parameter.py | 3 --- python/ray/scripts/scripts.py | 13 ++----------- python/ray/worker.py | 3 --- 5 files changed, 3 insertions(+), 41 deletions(-) diff --git a/python/ray/_private/services.py b/python/ray/_private/services.py index 83a282011..02485a30d 100644 --- a/python/ray/_private/services.py +++ b/python/ray/_private/services.py @@ -1330,7 +1330,6 @@ def start_raylet(redis_address, stdout_file=None, stderr_file=None, config=None, - java_worker_options=None, huge_pages=False, fate_share=None, socket_to_use=None, @@ -1373,7 +1372,6 @@ def start_raylet(redis_address, no redirection should happen, then this should be None. config (dict|None): Optional Raylet configuration that will override defaults in RayConfig. - java_worker_options (list): The command options for Java worker. max_bytes (int): Log rotation parameter. Corresponding to RotatingFileHandler's maxBytes. backup_count (int): Log rotation parameter. Corresponding to @@ -1416,7 +1414,6 @@ def start_raylet(redis_address, include_java = has_java_command and ray_java_installed if include_java is True: java_worker_command = build_java_worker_command( - json.loads(java_worker_options) if java_worker_options else [], redis_address, plasma_store_name, raylet_name, @@ -1555,7 +1552,6 @@ def get_ray_jars_dir(): def build_java_worker_command( - java_worker_options, redis_address, plasma_store_name, raylet_name, @@ -1566,7 +1562,6 @@ def build_java_worker_command( """This method assembles the command used to start a Java worker. Args: - java_worker_options (list): The command options for Java worker. redis_address (str): Redis address of GCS. plasma_store_name (str): The name of the plasma store socket to connect to. @@ -1602,24 +1597,7 @@ def build_java_worker_command( # Add ray jars path to java classpath ray_jars = os.path.join(get_ray_jars_dir(), "*") - if java_worker_options is None: - options = [] - else: - assert isinstance(java_worker_options, (tuple, list)) - options = list(java_worker_options) - cp_index = -1 - for i in range(len(options)): - option = options[i] - if option == "-cp" or option == "-classpath": - cp_index = i + 1 - break - if cp_index != -1: - options[cp_index] = options[cp_index] + os.pathsep + ray_jars - else: - options = ["-cp", ray_jars] + options - # Put `java_worker_options` in the last, so it can overwrite the - # above options. - command += options + command += ["-cp", ray_jars] command += ["RAY_WORKER_DYNAMIC_OPTION_PLACEHOLDER"] command += ["io.ray.runtime.runner.worker.DefaultWorker"] diff --git a/python/ray/node.py b/python/ray/node.py index 838b81066..a643709ef 100644 --- a/python/ray/node.py +++ b/python/ray/node.py @@ -806,7 +806,6 @@ class Node: stdout_file=stdout_file, stderr_file=stderr_file, config=self._config, - java_worker_options=self._ray_params.java_worker_options, huge_pages=self._ray_params.huge_pages, fate_share=self.kernel_fate_share, socket_to_use=self.socket, diff --git a/python/ray/parameter.py b/python/ray/parameter.py index 9efd601e6..284804a78 100644 --- a/python/ray/parameter.py +++ b/python/ray/parameter.py @@ -93,7 +93,6 @@ class RayParams: monitor the log files for all processes on this node and push their contents to Redis. autoscaling_config: path to autoscaling config file. - java_worker_options (list): The command options for Java worker. metrics_agent_port(int): The port to bind metrics agent. metrics_export_port(int): The port at which metrics are exposed through a Prometheus endpoint. @@ -147,7 +146,6 @@ class RayParams: temp_dir=None, include_log_monitor=None, autoscaling_config=None, - java_worker_options=None, start_initial_python_workers_for_first_job=False, _system_config=None, enable_object_reconstruction=False, @@ -191,7 +189,6 @@ class RayParams: self.temp_dir = temp_dir self.include_log_monitor = include_log_monitor self.autoscaling_config = autoscaling_config - self.java_worker_options = java_worker_options self.metrics_agent_port = metrics_agent_port self.metrics_export_port = metrics_export_port self.no_monitor = no_monitor diff --git a/python/ray/scripts/scripts.py b/python/ray/scripts/scripts.py index 51970f543..48af73887 100644 --- a/python/ray/scripts/scripts.py +++ b/python/ray/scripts/scripts.py @@ -395,13 +395,6 @@ def debug(address): hidden=True, default=None, help="manually specify the root temporary dir of the Ray process") -@click.option( - "--java-worker-options", - required=False, - hidden=True, - default=None, - type=str, - help="Overwrite the options to start Java workers.") @click.option( "--system-config", default=None, @@ -444,9 +437,8 @@ def start(node_ip_address, address, port, redis_password, redis_shard_ports, include_dashboard, dashboard_host, dashboard_port, block, plasma_directory, autoscaling_config, no_redirect_worker_output, no_redirect_output, plasma_store_socket_name, raylet_socket_name, - temp_dir, java_worker_options, system_config, lru_evict, - enable_object_reconstruction, metrics_export_port, no_monitor, - log_style, log_color, verbose): + temp_dir, system_config, lru_evict, enable_object_reconstruction, + metrics_export_port, no_monitor, log_style, log_color, verbose): """Start Ray processes manually on the local machine.""" cli_logger.configure(log_style, log_color, verbose) if gcs_server_port and not head: @@ -503,7 +495,6 @@ def start(node_ip_address, address, port, redis_password, redis_shard_ports, include_dashboard=include_dashboard, dashboard_host=dashboard_host, dashboard_port=dashboard_port, - java_worker_options=java_worker_options, _system_config=system_config, lru_evict=lru_evict, enable_object_reconstruction=enable_object_reconstruction, diff --git a/python/ray/worker.py b/python/ray/worker.py index 28a699261..fb49c8f84 100644 --- a/python/ray/worker.py +++ b/python/ray/worker.py @@ -515,7 +515,6 @@ def init( _driver_object_store_memory=None, _memory=None, _redis_password=ray_constants.REDIS_DEFAULT_PASSWORD, - _java_worker_options=None, _temp_dir=None, _lru_evict=False, _metrics_export_port=None, @@ -606,7 +605,6 @@ def init( _temp_dir (str): If provided, specifies the root temporary directory for the Ray process. Defaults to an OS-specific conventional location, e.g., "/tmp/ray". - _java_worker_options: Overwrite the options to start Java workers. _metrics_export_port(int): Port number Ray exposes system metrics through a Prometheus endpoint. It is currently under active development, and the API is subject to change. @@ -713,7 +711,6 @@ def init( redis_max_memory=_redis_max_memory, plasma_store_socket_name=None, temp_dir=_temp_dir, - java_worker_options=_java_worker_options, start_initial_python_workers_for_first_job=True, _system_config=_system_config, lru_evict=_lru_evict,