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

[Core] Logging improvements (#10625)

Browse Source 
* other stuff
:

* lint

* .

* .

* lint

* comment

* lint

* .
This commit is contained in:
Alex Wu
2020-09-08 20:58:05 -07:00
committed by GitHub
parent b7040f1310
commit d9c68fca5c
5 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/node.py
+34 -18
View File
@@ -276,13 +276,14 @@ class Node:
key, params_dict[key], env_dict[key]))
return num_cpus, num_gpus, memory, object_store_memory, result
env_resources = {}
env_string = os.getenv(ray_constants.RESOURCES_ENVIRONMENT_VARIABLE)
if env_string:
env_resources = json.loads(env_string)
logger.info(f"Autosaler overriding resources: {env_resources}.")
if not self._resource_spec:
env_resources = {}
env_string = os.getenv(
ray_constants.RESOURCES_ENVIRONMENT_VARIABLE)
if env_string:
env_resources = json.loads(env_string)
logger.info(
f"Autosaler overriding resources: {env_resources}.")
num_cpus, num_gpus, memory, object_store_memory, resources = \
merge_resources(env_resources, self._ray_params.resources)
self._resource_spec = ResourceSpec(
@@ -649,16 +650,17 @@ class Node:
redis_client = self.create_redis_client()
redis_client.hmset("webui", {"url": self._webui_url})
def start_plasma_store(self):
def start_plasma_store(self, plasma_directory, object_store_memory):
"""Start the plasma store."""
stdout_file, stderr_file = self.get_log_file_handles(
"plasma_store", unique=True)
process_info = ray.services.start_plasma_store(
self.get_resource_spec(),
plasma_directory,
object_store_memory,
self._plasma_store_socket_name,
stdout_file=stdout_file,
stderr_file=stderr_file,
plasma_directory=self._ray_params.plasma_directory,
huge_pages=self._ray_params.huge_pages,
keep_idle=bool(self._config.get("plasma_store_as_thread")),
fate_share=self.kernel_fate_share)
@@ -688,7 +690,11 @@ class Node:
process_info,
]
def start_raylet(self, use_valgrind=False, use_profiler=False):
def start_raylet(self,
plasma_directory,
object_store_memory,
use_valgrind=False,
use_profiler=False):
"""Start the raylet.
Args:
@@ -709,12 +715,14 @@ class Node:
self._temp_dir,
self._session_dir,
self.get_resource_spec(),
self._ray_params.min_worker_port,
self._ray_params.max_worker_port,
self._ray_params.object_manager_port,
self._ray_params.redis_password,
self._ray_params.metrics_agent_port,
self._metrics_export_port,
plasma_directory,
object_store_memory,
min_worker_port=self._ray_params.min_worker_port,
max_worker_port=self._ray_params.max_worker_port,
object_manager_port=self._ray_params.object_manager_port,
redis_password=self._ray_params.redis_password,
metrics_agent_port=self._ray_params.metrics_agent_port,
metrics_export_port=self._metrics_export_port,
use_valgrind=use_valgrind,
use_profiler=use_profiler,
stdout_file=stdout_file,
@@ -723,7 +731,6 @@ class Node:
include_java=self._ray_params.include_java,
java_worker_options=self._ray_params.java_worker_options,
load_code_from_local=self._ray_params.load_code_from_local,
plasma_directory=self._ray_params.plasma_directory,
huge_pages=self._ray_params.huge_pages,
fate_share=self.kernel_fate_share,
socket_to_use=self.socket,
@@ -810,8 +817,17 @@ class Node:
logger.debug(f"Process STDOUT and STDERR is being "
f"redirected to {self._logs_dir}.")
self.start_plasma_store()
self.start_raylet()
# Make sure we don't call `determine_plasma_store_config` multiple
# times to avoid printing multiple warnings.
resource_spec = self.get_resource_spec()
plasma_directory, object_store_memory = \
ray.services.determine_plasma_store_config(
resource_spec.object_store_memory,
plasma_directory=self._ray_params.plasma_directory,
huge_pages=self._ray_params.huge_pages
)
self.start_plasma_store(plasma_directory, object_store_memory)
self.start_raylet(plasma_directory, object_store_memory)
if "RAY_USE_NEW_DASHBOARD" not in os.environ:
self.start_reporter()