From bc438ca73bbb1e2a3a75f5e56dfb1a7a53b81977 Mon Sep 17 00:00:00 2001
From: Wang Qing <kingchin1218@126.com>
Date: Mon, 11 Feb 2019 23:55:40 +0800
Subject: [PATCH] [Java] Refine Java config item (#4014)

* Refine

* Address comment.
---
 .../src/main/java/org/ray/runtime/config/RayConfig.java    | 7 ++++++-
 .../src/main/java/org/ray/runtime/runner/RunManager.java   | 2 +-
 java/runtime/src/main/resources/ray.default.conf           | 2 ++
 java/test/src/main/java/org/ray/api/test/BaseTest.java     | 4 ----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java b/java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java
index 12a62dd1c..7a22b07b2 100644
--- a/java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java
+++ b/java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java
@@ -168,7 +168,7 @@ public class RayConfig {
     // raylet parameters
     rayletConfigParameters = new ArrayList<String>();
     Config rayletConfig = config.getConfig("ray.raylet.config");
-    for (java.util.Map.Entry<java.lang.String,ConfigValue> entry : rayletConfig.entrySet()) {
+    for (Map.Entry<String,ConfigValue> entry : rayletConfig.entrySet()) {
       String parameter = entry.getKey() + "," + String.valueOf(entry.getValue().unwrapped());
       rayletConfigParameters.add(parameter);
     }
@@ -233,6 +233,7 @@ public class RayConfig {
         + ", redirectOutput=" + redirectOutput
         + ", libraryPath=" + libraryPath
         + ", classpath=" + classpath
+        + ", jvmParameters=" + jvmParameters
         + ", redisAddress='" + redisAddress + '\''
         + ", redisIp='" + redisIp + '\''
         + ", redisPort=" + redisPort
@@ -241,9 +242,13 @@ public class RayConfig {
         + ", objectStoreSocketName='" + objectStoreSocketName + '\''
         + ", objectStoreSize=" + objectStoreSize
         + ", rayletSocketName='" + rayletSocketName + '\''
+        + ", rayletConfigParameters=" + rayletConfigParameters
         + ", redisServerExecutablePath='" + redisServerExecutablePath + '\''
+        + ", redisModulePath='" + redisModulePath + '\''
         + ", plasmaStoreExecutablePath='" + plasmaStoreExecutablePath + '\''
         + ", rayletExecutablePath='" + rayletExecutablePath + '\''
+        + ", driverResourcePath='" + driverResourcePath + '\''
+        + ", pythonWorkerCommand='" + pythonWorkerCommand + '\''
         + '}';
   }
 
diff --git a/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java b/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
index 0233d15c5..d2e72c646 100644
--- a/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
+++ b/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
@@ -205,7 +205,7 @@ public class RunManager {
         "0", // number of initial workers
         String.valueOf(maximumStartupConcurrency),
         ResourceUtil.getResourcesStringFromMap(rayConfig.resources),
-        String.join(",", rayConfig.rayletConfigParameters),  // The internal config list.
+        String.join(",", rayConfig.rayletConfigParameters), // The internal config list.
         buildPythonWorkerCommand(), // python worker command
         buildWorkerCommandRaylet() // java worker command
     );
diff --git a/java/runtime/src/main/resources/ray.default.conf b/java/runtime/src/main/resources/ray.default.conf
index a77e1bc4d..f863300ae 100644
--- a/java/runtime/src/main/resources/ray.default.conf
+++ b/java/runtime/src/main/resources/ray.default.conf
@@ -88,6 +88,8 @@ ray {
 
     // See src/ray/ray_config_def.h for options.
     config {
+      // Maximum size of an inline object (bytes).
+      inline_object_max_size_bytes: 0
     }
   }
 
diff --git a/java/test/src/main/java/org/ray/api/test/BaseTest.java b/java/test/src/main/java/org/ray/api/test/BaseTest.java
index 55e27dbda..d44ae348e 100644
--- a/java/test/src/main/java/org/ray/api/test/BaseTest.java
+++ b/java/test/src/main/java/org/ray/api/test/BaseTest.java
@@ -3,9 +3,7 @@ package org.ray.api.test;
 import java.io.File;
 import org.ray.api.Ray;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
 
 public class BaseTest {
 
@@ -13,7 +11,6 @@ public class BaseTest {
   public void setUp() {
     System.setProperty("ray.home", "../..");
     System.setProperty("ray.resources", "CPU:4,RES-A:4");
-    System.setProperty("ray.raylet.config.inline_object_max_size_bytes", "0");
     Ray.init();
   }
 
@@ -30,7 +27,6 @@ public class BaseTest {
     // unset system properties
     System.clearProperty("ray.home");
     System.clearProperty("ray.resources");
-    System.clearProperty("ray.raylet.config.inline_object_max_size_bytes");
   }
 
 }