Fix

ray-project · May 16, 2019 · 4870c10 · 4870c10
1 parent 66b6561
commit 4870c10
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
@@ -75,6 +75,7 @@ define_java_module(
         "@maven//:org_ow2_asm_asm",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_slf4j_slf4j_log4j12",
+        "@maven//:org_testng_testng",
         "@maven//:redis_clients_jedis",
     ],
 )

diff --git a/java/runtime/pom.xml b/java/runtime/pom.xml
@@ -71,6 +71,11 @@
   <artifactId>slf4j-log4j12</artifactId>
   <version>1.7.25</version>
 </dependency>
+<dependency>
+  <groupId>org.testng</groupId>
+  <artifactId>testng</artifactId>
+  <version>6.9.9</version>
+</dependency>
 <dependency>
   <groupId>redis.clients</groupId>
   <artifactId>jedis</artifactId>

diff --git a/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java b/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java
@@ -76,13 +76,13 @@ public List<NodeInfo> getAllNodeInfo() {
         NodeInfo nodeInfo = new NodeInfo(
             clientId, data.nodeManagerAddress(), true, resources);
         clients.put(clientId, nodeInfo);
-      } else if (data.entryType() == EntryType.RES_CREATEUPDATE){
+      } else if (data.entryType() == EntryType.RES_CREATEUPDATE) {
         Preconditions.checkState(clients.containsKey(clientId));
         NodeInfo nodeInfo = clients.get(clientId);
         for (int i = 0; i < data.resourcesTotalLabelLength(); i++) {
           nodeInfo.resources.put(data.resourcesTotalLabel(i), data.resourcesTotalCapacity(i));
         }
-      } else if (data.entryType() == EntryType.RES_DELETE){
+      } else if (data.entryType() == EntryType.RES_DELETE) {
         Preconditions.checkState(clients.containsKey(clientId));
         NodeInfo nodeInfo = clients.get(clientId);
         for (int i = 0; i < data.resourcesTotalLabelLength(); i++) {

diff --git a/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java b/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java
@@ -2,7 +2,6 @@
 
 import org.ray.api.Ray;
 import org.ray.runtime.AbstractRayRuntime;
-import org.ray.runtime.util.WorkerUncaughtExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +15,9 @@ public class DefaultWorker {
   public static void main(String[] args) {
     try {
       System.setProperty("ray.worker.mode", "WORKER");
-      Thread.setDefaultUncaughtExceptionHandler(new WorkerUncaughtExceptionHandler());
+      Thread.setDefaultUncaughtExceptionHandler((Thread t, Throwable e) -> {
+        LOGGER.error("Uncaught worker exception in thread {}: {}", t, e);
+      });
       Ray.init();
       LOGGER.info("Worker started.");
       ((AbstractRayRuntime)Ray.internal()).loop();

diff --git a/java/runtime/src/main/java/org/ray/runtime/util/WorkerUncaughtExceptionHandler.java b/java/runtime/src/main/java/org/ray/runtime/util/WorkerUncaughtExceptionHandler.java