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

src/ray/common/constants.h

@@ -43,10 +43,4 @@ 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/common/ray_config_def.h

@@ -273,3 +273,12 @@ RAY_CONFIG(uint32_t, object_store_full_initial_delay_ms, 1000)
 
 /// Duration to wait between retries for failed tasks.
 RAY_CONFIG(uint32_t, task_retry_delay_ms, 5000)
+
+/// Whether to enable gcs service.
+/// 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.
+RAY_CONFIG(bool, gcs_service_enabled,
+           getenv("RAY_GCS_SERVICE_ENABLED") == nullptr ||
+               getenv("RAY_GCS_SERVICE_ENABLED") == std::string("true"))

src/ray/core_worker/core_worker.cc

@@ -115,8 +115,7 @@ CoreWorker::CoreWorker(const WorkerType worker_type, const Language language,
     RayLog::InstallFailureSignalHandler();
   }
   // Initialize gcs client.
-  if (getenv(kRayGcsServiceEnabled) == nullptr ||
-      strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
+  if (RayConfig::instance().gcs_service_enabled()) {
     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

@@ -109,8 +109,7 @@ class CoreWorkerTest : public ::testing::Test {
     }
 
     // start gcs server
-    if (getenv(kRayGcsServiceEnabled) == nullptr ||
-        strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
+    if (RayConfig::instance().gcs_service_enabled()) {
       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

@@ -177,8 +177,7 @@ 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;
 
-  if (getenv(kRayGcsServiceEnabled) == nullptr ||
-      strcmp(getenv(kRayGcsServiceEnabled), "true") == 0) {
+  if (RayConfig::instance().gcs_service_enabled()) {
     gcs_client = std::make_shared<ray::gcs::ServiceBasedGcsClient>(client_options);
   } else {
     gcs_client = std::make_shared<ray::gcs::RedisGcsClient>(client_options);