From 26cffb9c7cae6c8010b6ee4cbf78245dc462195b Mon Sep 17 00:00:00 2001
From: Kai Yang <kfstorm@outlook.com>
Date: Tue, 26 May 2020 15:23:44 +0800
Subject: [PATCH] Fix shutdown hook in worker mode (#8098)

---
 .../main/java/io/ray/runtime/RayNativeRuntime.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/java/runtime/src/main/java/io/ray/runtime/RayNativeRuntime.java b/java/runtime/src/main/java/io/ray/runtime/RayNativeRuntime.java
index 5c8f2dc3c..e0df1b521 100644
--- a/java/runtime/src/main/java/io/ray/runtime/RayNativeRuntime.java
+++ b/java/runtime/src/main/java/io/ray/runtime/RayNativeRuntime.java
@@ -102,12 +102,14 @@ public final class RayNativeRuntime extends AbstractRayRuntime {
 
   @Override
   public void shutdown() {
-    nativeShutdown();
-    if (null != manager) {
-      manager.cleanup();
-      manager = null;
+    if (rayConfig.workerMode == WorkerType.DRIVER) {
+      nativeShutdown();
+      if (null != manager) {
+        manager.cleanup();
+        manager = null;
+      }
+      RayConfig.reset();
     }
-    RayConfig.reset();
     LOGGER.info("RayNativeRuntime shutdown");
   }