Merge remote-tracking branch 'remotes/upstream/refactor-architecture' into dev

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java

@@ -64,11 +64,17 @@ public class LoggerService {
     Result result = new Result(Status.SUCCESS.getCode(), Status.SUCCESS.getMsg());
 
     logger.info("log host : {} , logPath : {} , logServer port : {}",host,taskInstance.getLogPath(),Constants.RPC_PORT);
-
+    LogClientService logClient = null;
-    LogClientService logClient = new LogClientService(host, Constants.RPC_PORT);
+    try {
+      logClient = new LogClientService(host, Constants.RPC_PORT);
       String log = logClient.rollViewLog(taskInstance.getLogPath(),skipLineNum,limit);
       result.setData(log);
       logger.info(log);
+    } finally {
+      if(logClient != null){
+        logClient.close();
+      }
+    }
 
     return result;
   }
@@ -86,7 +92,14 @@ public class LoggerService {
     }
 
     String host = taskInstance.getHost();
-    LogClientService logClient = new LogClientService(host, Constants.RPC_PORT);
+    LogClientService logClient = null;
+    try {
+      logClient = new LogClientService(host, Constants.RPC_PORT);
       return logClient.getLogBytes(taskInstance.getLogPath());
+    } finally {
+      if(logClient != null){
+        logClient.close();
+      }
+    }
   }
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java

@@ -375,9 +375,16 @@ public class ProcessUtils {
   public static void killYarnJob(TaskInstance taskInstance) {
     try {
       Thread.sleep(Constants.SLEEP_TIME_MILLIS);
-      LogClientService logClient = new LogClientService(taskInstance.getHost(), Constants.RPC_PORT);
+      LogClientService logClient = null;
-
+      String log = null;
-      String log = logClient.viewLog(taskInstance.getLogPath());
+      try {
+        logClient = new LogClientService(taskInstance.getHost(), Constants.RPC_PORT);
+        log = logClient.viewLog(taskInstance.getLogPath());
+      } finally {
+        if(logClient != null){
+          logClient.close();
+        }
+      }
       if (StringUtils.isNotEmpty(log)) {
         List<String> appIds = LoggerUtils.getAppIds(log, logger);
         String workerDir = taskInstance.getExecutePath();

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogClientService.java

@@ -64,11 +64,11 @@ public class LogClientService implements NettyRequestProcessor {
     }
 
     /**
-     * shutdown
+     * close
      */
-    public void shutdown()  {
+    public void close()  {
         this.client.close();
-        logger.info("logger client shutdown");
+        logger.info("logger client closed");
     }
 
     /**