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

Add gcs_service_enabled function to avoid getting environment variable directly (#7742)

Browse Source
This commit is contained in:
fangfengbin
2020-03-26 22:02:53 +08:00
committed by GitHub
parent ca6eabc9cb
commit e196fcdbaf
12 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/node.py
+1 -1
View File
@@ -626,7 +626,7 @@ class Node:
# If this is the head node, start the relevant head node processes.
self.start_redis()
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
self.start_gcs_server()
else:
self.start_raylet_monitor()
python/ray/ray_constants.py
+7 -1
View File
@@ -13,6 +13,12 @@ def env_integer(key, default):
return default
def env_bool(key, default):
if key in os.environ:
return True if os.environ[key].lower() == "true" else False
return default
ID_SIZE = 20
# The default maximum number of bytes to allocate to the object store unless
@@ -197,4 +203,4 @@ MACH_PAGE_SIZE_BYTES = 4096
# RAY_GCS_SERVICE_ENABLED only set in ci job.
# TODO(ffbin): Once we entirely migrate to service-based GCS, we should
# remove it.
RAY_GCS_SERVICE_ENABLED = "RAY_GCS_SERVICE_ENABLED"
GCS_SERVICE_ENABLED = env_bool("RAY_GCS_SERVICE_ENABLED", True)
python/ray/tests/test_component_failures_3.py
+2 -2
View File
@@ -82,7 +82,7 @@ def test_driver_lives_sequential(ray_start_regular):
ray.worker._global_node.kill_plasma_store()
ray.worker._global_node.kill_log_monitor()
ray.worker._global_node.kill_monitor()
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
ray.worker._global_node.kill_gcs_server()
else:
ray.worker._global_node.kill_raylet_monitor()
@@ -96,7 +96,7 @@ def test_driver_lives_sequential(ray_start_regular):
def test_driver_lives_parallel(ray_start_regular):
all_processes = ray.worker._global_node.all_processes
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
process_infos = (all_processes[ray_constants.PROCESS_TYPE_PLASMA_STORE]
+ all_processes[ray_constants.PROCESS_TYPE_GCS_SERVER]
+ all_processes[ray_constants.PROCESS_TYPE_RAYLET] +
python/ray/tests/test_multinode_failures_2.py
+2 -2
View File
@@ -132,7 +132,7 @@ def test_driver_lives_sequential(ray_start_regular):
ray.worker._global_node.kill_plasma_store()
ray.worker._global_node.kill_log_monitor()
ray.worker._global_node.kill_monitor()
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
ray.worker._global_node.kill_gcs_server()
else:
ray.worker._global_node.kill_raylet_monitor()
@@ -145,7 +145,7 @@ def test_driver_lives_sequential(ray_start_regular):
reason="Hanging with new GCS API.")
def test_driver_lives_parallel(ray_start_regular):
all_processes = ray.worker._global_node.all_processes
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
process_infos = (all_processes[ray_constants.PROCESS_TYPE_PLASMA_STORE]
+ all_processes[ray_constants.PROCESS_TYPE_GCS_SERVER]
+ all_processes[ray_constants.PROCESS_TYPE_RAYLET] +
python/ray/tests/test_tempfile.py
+1 -1
View File
@@ -145,7 +145,7 @@ def test_raylet_tempfiles(shutdown_only):
"raylet.err"
}
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
if ray_constants.GCS_SERVICE_ENABLED:
log_files_expected.update({"gcs_server.out", "gcs_server.err"})
else:
log_files_expected.update({"raylet_monitor.out", "raylet_monitor.err"})