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

Remove gcs_service_disabled ci jobs and code (#8854)

Browse Source
This commit is contained in:
Zhilei Chen
2020-06-19 11:32:27 +08:00
committed by GitHub
parent e89b8d37ae
commit d8a9247448
19 changed files with 46 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/_raylet.pyx
-1
View File
@@ -117,7 +117,6 @@ logger = logging.getLogger(__name__)
def gcs_actor_service_enabled():
return (
RayConfig.instance().gcs_service_enabled() and
RayConfig.instance().gcs_actor_service_enabled())
python/ray/includes/ray_config.pxd
-2
View File
@@ -85,6 +85,4 @@ cdef extern from "ray/common/ray_config.h" nogil:
int64_t max_direct_call_object_size() const
c_bool gcs_service_enabled() const
c_bool gcs_actor_service_enabled() const
python/ray/node.py
+1 -30
View File
@@ -662,22 +662,6 @@ class Node:
assert ray_constants.PROCESS_TYPE_MONITOR not in self.all_processes
self.all_processes[ray_constants.PROCESS_TYPE_MONITOR] = [process_info]
def start_raylet_monitor(self):
"""Start the raylet monitor."""
stdout_file, stderr_file = self.new_log_files("raylet_monitor")
process_info = ray.services.start_raylet_monitor(
self._redis_address,
stdout_file=stdout_file,
stderr_file=stderr_file,
redis_password=self._ray_params.redis_password,
config=self._config,
fate_share=self.kernel_fate_share)
assert (ray_constants.PROCESS_TYPE_RAYLET_MONITOR not in
self.all_processes)
self.all_processes[ray_constants.PROCESS_TYPE_RAYLET_MONITOR] = [
process_info,
]
def start_head_processes(self):
"""Start head processes on the node."""
logger.debug(
@@ -687,10 +671,7 @@ class Node:
# If this is the head node, start the relevant head node processes.
self.start_redis()
if ray_constants.GCS_SERVICE_ENABLED:
self.start_gcs_server()
else:
self.start_raylet_monitor()
self.start_gcs_server()
self.start_monitor()
@@ -876,16 +857,6 @@ class Node:
self._kill_process_type(
ray_constants.PROCESS_TYPE_GCS_SERVER, check_alive=check_alive)
def kill_raylet_monitor(self, check_alive=True):
"""Kill the raylet monitor.
Args:
check_alive (bool): Raise an exception if the process was already
dead.
"""
self._kill_process_type(
ray_constants.PROCESS_TYPE_RAYLET_MONITOR, check_alive=check_alive)
def kill_reaper(self, check_alive=True):
"""Kill the reaper process.
python/ray/ray_constants.py
-5
View File
@@ -197,11 +197,6 @@ NODE_DEFAULT_IP = "127.0.0.1"
# The Mach kernel page size in bytes.
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.
GCS_SERVICE_ENABLED = env_bool("RAY_GCS_SERVICE_ENABLED", True)
# Max 64 bit integer value, which is needed to ensure against overflow
# in C++ when passing integer values cross-language.
MAX_INT64_VALUE = 9223372036854775807
python/ray/tests/test_component_failures_3.py
+6 -17
View File
@@ -83,10 +83,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 ray_constants.GCS_SERVICE_ENABLED:
ray.worker._global_node.kill_gcs_server()
else:
ray.worker._global_node.kill_raylet_monitor()
ray.worker._global_node.kill_gcs_server()
# If the driver can reach the tearDown method, then it is still alive.
@@ -97,19 +94,11 @@ 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 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] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR]
+ all_processes[ray_constants.PROCESS_TYPE_MONITOR])
else:
process_infos = (
all_processes[ray_constants.PROCESS_TYPE_PLASMA_STORE] +
all_processes[ray_constants.PROCESS_TYPE_RAYLET] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_RAYLET_MONITOR])
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] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_MONITOR])
assert len(process_infos) == 5
# Kill all the components in parallel.
python/ray/tests/test_multinode_failures_2.py
+7 -17
View File
@@ -133,10 +133,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 ray_constants.GCS_SERVICE_ENABLED:
ray.worker._global_node.kill_gcs_server()
else:
ray.worker._global_node.kill_raylet_monitor()
ray.worker._global_node.kill_gcs_server()
# If the driver can reach the tearDown method, then it is still alive.
@@ -146,19 +143,12 @@ 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 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] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR]
+ all_processes[ray_constants.PROCESS_TYPE_MONITOR])
else:
process_infos = (
all_processes[ray_constants.PROCESS_TYPE_PLASMA_STORE] +
all_processes[ray_constants.PROCESS_TYPE_RAYLET] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_RAYLET_MONITOR])
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] +
all_processes[ray_constants.PROCESS_TYPE_LOG_MONITOR] +
all_processes[ray_constants.PROCESS_TYPE_MONITOR])
assert len(process_infos) == 5
# Kill all the components in parallel.
python/ray/tests/test_tempfile.py
+1 -5
View File
@@ -6,7 +6,6 @@ import time
import pytest
import ray
import ray.ray_constants as ray_constants
from ray.cluster_utils import Cluster
@@ -154,10 +153,7 @@ def test_raylet_tempfiles(shutdown_only):
"raylet.err"
}
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"})
log_files_expected.update({"gcs_server.out", "gcs_server.err"})
assert log_files.issuperset(log_files_expected)