From 57ff13461ca0702b77d3bb64e59b6044c9c4be8f Mon Sep 17 00:00:00 2001
From: Qing Wang <kingchin1218@gmail.com>
Date: Tue, 11 Jan 2022 02:58:22 +0800
Subject: [PATCH] [Java] Use localhost instead of public ip (#21462)

Use localhost ip address instead of public ip for avoid security popups on MacOS.
This also reverts This reverts commit e4542be0d1eb9424b7fe1a4e90f2c7507ddaa884.
---
 .../src/main/java/io/ray/runtime/config/RayConfig.java | 10 +++++++++-
 .../main/java/io/ray/runtime/runner/RunManager.java    |  2 --
 .../src/main/java/io/ray/runtime/util/NetworkUtil.java |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/java/runtime/src/main/java/io/ray/runtime/config/RayConfig.java b/java/runtime/src/main/java/io/ray/runtime/config/RayConfig.java
index a8134a0c8..3b9d1882f 100644
--- a/java/runtime/src/main/java/io/ray/runtime/config/RayConfig.java
+++ b/java/runtime/src/main/java/io/ray/runtime/config/RayConfig.java
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 /** Configurations of Ray runtime. See `ray.default.conf` for the meaning of each field. */
 public class RayConfig {
@@ -111,8 +112,15 @@ public class RayConfig {
     if (config.hasPath("ray.node-ip")) {
       nodeIp = config.getString("ray.node-ip");
     } else {
-      nodeIp = NetworkUtil.getIpAddress(null);
+      if (SystemUtils.IS_OS_LINUX) {
+        nodeIp = NetworkUtil.getIpAddress(null);
+      } else {
+        /// We use a localhost on MacOS or Windows to avid security popups.
+        /// See the related issue https://github.com/ray-project/ray/issues/18730
+        nodeIp = NetworkUtil.localhostIp();
+      }
     }
+
     // Job id.
     String jobId = config.getString("ray.job.id");
     if (!jobId.isEmpty()) {
diff --git a/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java b/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java
index aeb1a7ed9..9903dc925 100644
--- a/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java
+++ b/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java
@@ -28,8 +28,6 @@ public class RunManager {
     command.add("--head");
     command.add("--redis-password");
     command.add(rayConfig.redisPassword);
-    command.add("--node-ip-address");
-    command.add(rayConfig.nodeIp);
     command.addAll(rayConfig.headArgs);
 
     String numGpus = System.getProperty("num-gpus");
diff --git a/java/runtime/src/main/java/io/ray/runtime/util/NetworkUtil.java b/java/runtime/src/main/java/io/ray/runtime/util/NetworkUtil.java
index 07986abd0..0875edec6 100644
--- a/java/runtime/src/main/java/io/ray/runtime/util/NetworkUtil.java
+++ b/java/runtime/src/main/java/io/ray/runtime/util/NetworkUtil.java
@@ -43,4 +43,8 @@ public class NetworkUtil {
 
     return "127.0.0.1";
   }
+
+  public static String localhostIp() {
+    return "127.0.0.1";
+  }
 }