From ca391ed0524e9bbf17567f5a5f7c18459f706caa Mon Sep 17 00:00:00 2001
From: SangBin Cho <rkooo567@gmail.com>
Date: Wed, 22 Jul 2020 14:31:41 -0700
Subject: [PATCH] [Core] GCS Actor management on by default. (#8845)

* GCS Actor management on by default.

* Fix travis config.

* Change condition.

* Remove unnecessary CI.
---
 .travis.yml                     | 17 -----------------
 src/ray/common/ray_config_def.h |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b60e06c3..5646399a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,25 +57,11 @@ matrix:
       before_script:
         - . ./ci/travis/ci.sh build
 
-    - os: osx
-      osx_image: xcode7
-      env:
-        - PYTHON=3.6 RAY_GCS_ACTOR_SERVICE_ENABLED=true
-        - PYTHONWARNINGS=ignore
-        - RAY_DEFAULT_BUILD=1
-        - RAY_CYTHON_EXAMPLES=1
-        - RAY_USE_RANDOM_PORTS=1
-      install:
-        - . ./ci/travis/ci.sh init RAY_CI_SERVE_AFFECTED,RAY_CI_TUNE_AFFECTED,RAY_CI_PYTHON_AFFECTED
-      before_script:
-        - . ./ci/travis/ci.sh build
-
     - os: linux
       env:
         - JDK='Oracle JDK 8'
         - PYTHON=3.6 PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
-        - RAY_GCS_ACTOR_SERVICE_ENABLED=true
       install:
         - . ./ci/travis/ci.sh init RAY_CI_JAVA_AFFECTED
       before_script:
@@ -88,7 +74,6 @@ matrix:
         - TESTSUITE=streaming
         - JDK='Oracle JDK 8'
         - RAY_INSTALL_JAVA=1
-        - RAY_GCS_ACTOR_SERVICE_ENABLED=true
         - PYTHON=3.6 PYTHONWARNINGS=ignore
         - RAY_USE_RANDOM_PORTS=1
       install:
@@ -119,7 +104,6 @@ matrix:
         - LINUX_WHEELS=1
         - PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
-        - RAY_GCS_ACTOR_SERVICE_ENABLED=true
       install:
         - . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED
       before_script:
@@ -135,7 +119,6 @@ matrix:
         - MAC_WHEELS=1
         - PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
-        - RAY_GCS_ACTOR_SERVICE_ENABLED=true
       install:
         - . ./ci/travis/ci.sh init RAY_CI_MACOS_WHEELS_AFFECTED
       before_script:
diff --git a/src/ray/common/ray_config_def.h b/src/ray/common/ray_config_def.h
index 945835e7e..d8973bc78 100644
--- a/src/ray/common/ray_config_def.h
+++ b/src/ray/common/ray_config_def.h
@@ -313,7 +313,7 @@ RAY_CONFIG(bool, plasma_store_as_thread, false)
 RAY_CONFIG(int64_t, gcs_service_address_check_interval_milliseconds, 1000)
 
 RAY_CONFIG(bool, gcs_actor_service_enabled,
-           getenv("RAY_GCS_ACTOR_SERVICE_ENABLED") != nullptr &&
+           getenv("RAY_GCS_ACTOR_SERVICE_ENABLED") == nullptr ||
                getenv("RAY_GCS_ACTOR_SERVICE_ENABLED") == std::string("true"))
 
 /// The batch size for metrics export.