wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-28 21:12:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start moving ray internal files to _private module (#10994)

Browse Source
This commit is contained in:
Eric Liang
2020-09-24 22:46:35 -07:00
committed by GitHub
parent 3b6fe72029
commit 609c1b8acd
39 changed files with 1825 additions and 1831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/node.py
+20 -19
View File
@@ -15,7 +15,7 @@ import time
import ray
import ray.ray_constants as ray_constants
import ray.services
import ray._private.services
import ray.utils
from ray.resource_spec import ResourceSpec
from ray.utils import try_to_create_directory, try_to_symlink, open_log
@@ -77,10 +77,10 @@ class Node:
if ray_params.node_ip_address:
node_ip_address = ray_params.node_ip_address
elif ray_params.redis_address:
node_ip_address = ray.services.get_node_ip_address(
node_ip_address = ray._private.services.get_node_ip_address(
ray_params.redis_address)
else:
node_ip_address = ray.services.get_node_ip_address()
node_ip_address = ray._private.services.get_node_ip_address()
self._node_ip_address = node_ip_address
if ray_params.raylet_ip_address:
@@ -156,10 +156,11 @@ class Node:
or self._ray_params.node_manager_port is None):
# Get the address info of the processes to connect to
# from Redis.
address_info = ray.services.get_address_info_from_redis(
self.redis_address,
self._raylet_ip_address,
redis_password=self.redis_password)
address_info = (
ray._private.services.get_address_info_from_redis(
self.redis_address,
self._raylet_ip_address,
redis_password=self.redis_password))
self._plasma_store_socket_name = address_info[
"object_store_address"]
self._raylet_socket_name = address_info["raylet_socket_name"]
@@ -178,7 +179,7 @@ class Node:
self._webui_url = None
else:
self._webui_url = (
ray.services.get_webui_url_from_redis(redis_client))
ray._private.services.get_webui_url_from_redis(redis_client))
if head or not connect_only:
# We need to start a local raylet.
@@ -384,7 +385,7 @@ class Node:
def create_redis_client(self):
"""Create a redis client."""
return ray.services.create_redis_client(
return ray._private.services.create_redis_client(
self._redis_address, self._ray_params.redis_password)
def get_temp_dir_path(self):
@@ -550,7 +551,7 @@ class Node:
"""
assert not self.kernel_fate_share, (
"a reaper should not be used with kernel fate-sharing")
process_info = ray.services.start_reaper(fate_share=False)
process_info = ray._private.services.start_reaper(fate_share=False)
assert ray_constants.PROCESS_TYPE_REAPER not in self.all_processes
if process_info is not None:
self.all_processes[ray_constants.PROCESS_TYPE_REAPER] = [
@@ -566,7 +567,7 @@ class Node:
self.get_log_file_handles(f"redis-shard_{i}", unique=True))
(self._redis_address, redis_shards,
process_infos) = ray.services.start_redis(
process_infos) = ray._private.services.start_redis(
self._node_ip_address,
redis_log_files,
self.get_resource_spec(),
@@ -586,7 +587,7 @@ class Node:
"""Start the log monitor."""
stdout_file, stderr_file = self.get_log_file_handles(
"log_monitor", unique=True)
process_info = ray.services.start_log_monitor(
process_info = ray._private.services.start_log_monitor(
self.redis_address,
self._logs_dir,
stdout_file=stdout_file,
@@ -603,7 +604,7 @@ class Node:
stdout_file, stderr_file = self.get_log_file_handles(
"reporter", unique=True)
process_info = ray.services.start_reporter(
process_info = ray._private.services.start_reporter(
self.redis_address,
self._ray_params.metrics_agent_port,
self._metrics_export_port,
@@ -630,7 +631,7 @@ class Node:
else:
stdout_file, stderr_file = self.get_log_file_handles(
"dashboard", unique=True)
self._webui_url, process_info = ray.services.start_dashboard(
self._webui_url, process_info = ray._private.services.start_dashboard(
require_dashboard,
self._ray_params.dashboard_host,
self.redis_address,
@@ -653,7 +654,7 @@ class Node:
"""Start the plasma store."""
stdout_file, stderr_file = self.get_log_file_handles(
"plasma_store", unique=True)
process_info = ray.services.start_plasma_store(
process_info = ray._private.services.start_plasma_store(
self.get_resource_spec(),
plasma_directory,
object_store_memory,
@@ -674,7 +675,7 @@ class Node:
"""
stdout_file, stderr_file = self.get_log_file_handles(
"gcs_server", unique=True)
process_info = ray.services.start_gcs_server(
process_info = ray._private.services.start_gcs_server(
self._redis_address,
stdout_file=stdout_file,
stderr_file=stderr_file,
@@ -705,7 +706,7 @@ class Node:
"""
stdout_file, stderr_file = self.get_log_file_handles(
"raylet", unique=True)
process_info = ray.services.start_raylet(
process_info = ray._private.services.start_raylet(
self._redis_address,
self._node_ip_address,
self._ray_params.node_manager_port,
@@ -784,7 +785,7 @@ class Node:
"""Start the monitor."""
stdout_file, stderr_file = self.get_log_file_handles(
"monitor", unique=True)
process_info = ray.services.start_monitor(
process_info = ray._private.services.start_monitor(
self._redis_address,
stdout_file=stdout_file,
stderr_file=stderr_file,
@@ -820,7 +821,7 @@ class Node:
# times to avoid printing multiple warnings.
resource_spec = self.get_resource_spec()
plasma_directory, object_store_memory = \
ray.services.determine_plasma_store_config(
ray._private.services.determine_plasma_store_config(
resource_spec.object_store_memory,
plasma_directory=self._ray_params.plasma_directory,
huge_pages=self._ray_params.huge_pages