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

Enable GCS Service by default (#7541)

Browse Source
This commit is contained in:
fangfengbin
2020-03-24 14:20:23 +08:00
committed by GitHub
parent b4030cdbbe
commit bf866de6fd
10 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -4
View File
@@ -49,11 +49,11 @@ matrix:
- os: linux
env:
- TESTSUITE=gcs_service
- TESTSUITE=gcs_service_disabled
- JDK='Oracle JDK 8'
- RAY_GCS_SERVICE_ENABLED=true
- PYTHON=3.6 PYTHONWARNINGS=ignore
- RAY_INSTALL_JAVA=1
- RAY_GCS_SERVICE_ENABLED=false
install:
- eval `python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py`
- ./ci/travis/install-bazel.sh
@@ -69,11 +69,11 @@ matrix:
- os: linux
env:
- TESTSUITE=gcs_service_python_testcase
- TESTSUITE=gcs_service_disabled_python_testcase
- JDK='Oracle JDK 8'
- RAY_GCS_SERVICE_ENABLED=true
- PYTHON=3.6 PYTHONWARNINGS=ignore
- RAY_INSTALL_JAVA=1
- RAY_GCS_SERVICE_ENABLED=false
install:
- eval `python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py`
- ./ci/travis/install-bazel.sh
java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
+2 -1
View File
@@ -226,7 +226,8 @@ public class RunManager {
}
// start gcs server
if (System.getenv("RAY_GCS_SERVICE_ENABLED") != null) {
if (System.getenv("RAY_GCS_SERVICE_ENABLED") == null ||
System.getenv("RAY_GCS_SERVICE_ENABLED") == "true") {
String redisPasswordOption = "";
if (!Strings.isNullOrEmpty(rayConfig.headRedisPassword)) {
redisPasswordOption = rayConfig.headRedisPassword;
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
self.start_gcs_server()
else:
self.start_raylet_monitor()
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
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, None):
if os.environ.get(ray_constants.RAY_GCS_SERVICE_ENABLED, True):
log_files_expected.update({"gcs_server.out", "gcs_server.err"})
else:
log_files_expected.update({"raylet_monitor.out", "raylet_monitor.err"})
src/ray/common/constants.h
+6
View File
@@ -43,4 +43,10 @@ constexpr char kWorkerDynamicOptionPlaceholderPrefix[] =
constexpr char kWorkerRayletConfigPlaceholder[] = "RAY_WORKER_RAYLET_CONFIG_PLACEHOLDER";
/// RAY_GCS_SERVICE_ENABLED is an env variable which only set in ci job.
/// If the value of RAY_GCS_SERVICE_ENABLED is false, we will disable gcs service,
/// otherwise gcs service is enabled.
/// TODO(ffbin): Once we entirely migrate to service-based GCS, we should remove it.
constexpr char kRayGcsServiceEnabled[] = "RAY_GCS_SERVICE_ENABLED";
#endif // RAY_CONSTANTS_H_
src/ray/core_worker/core_worker.cc
+2 -1
View File
@@ -115,7 +115,8 @@ CoreWorker::CoreWorker(const WorkerType worker_type, const Language language,
RayLog::InstallFailureSignalHandler();
}
// Initialize gcs client.
if (getenv("RAY_GCS_SERVICE_ENABLED") != nullptr) {
if (getenv(kRayGcsServiceEnabled) == nullptr ||
strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
gcs_client_ = std::make_shared<ray::gcs::ServiceBasedGcsClient>(gcs_options);
} else {
gcs_client_ = std::make_shared<ray::gcs::RedisGcsClient>(gcs_options);
src/ray/core_worker/test/core_worker_test.cc
+2 -1
View File
@@ -109,7 +109,8 @@ class CoreWorkerTest : public ::testing::Test {
}
// start gcs server
if (getenv("RAY_GCS_SERVICE_ENABLED") != nullptr) {
if (getenv(kRayGcsServiceEnabled) == nullptr ||
strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
gcs_server_pid_ = StartGcsServer("127.0.0.1");
} else {
// core worker test relies on node resources. It's important that one raylet can
src/ray/raylet/main.cc
+2 -2
View File
@@ -177,8 +177,8 @@ int main(int argc, char *argv[]) {
ray::gcs::GcsClientOptions client_options(redis_address, redis_port, redis_password);
std::shared_ptr<ray::gcs::GcsClient> gcs_client;
// RAY_GCS_SERVICE_ENABLED only set in ci job, so we just check if it is null.
if (getenv("RAY_GCS_SERVICE_ENABLED") != nullptr) {
if (getenv(kRayGcsServiceEnabled) == nullptr ||
strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
gcs_client = std::make_shared<ray::gcs::ServiceBasedGcsClient>(client_options);
} else {
gcs_client = std::make_shared<ray::gcs::RedisGcsClient>(client_options);