From 1e812ca07884d384952573a654e47e098a2930dc Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Thu, 13 Feb 2020 21:29:11 +0800
Subject: [PATCH] add finally block to close channel (#1951)

* move datasource classes to dao module

* fix send4LetterWord bug

* exclude jasper-compiler in case of runtime conflict

* add finally block to close channel
---
 .../api/service/LoggerService.java            | 27 ++++++++++++++-----
 .../service/ProcessDefinitionServiceTest.java |  1 -
 .../server/utils/ProcessUtils.java            | 13 ++++++---
 .../service/log/LogClientService.java         |  6 ++---
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java
index 056af8eff5..bff54b6c21 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java
+++ b/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 = new LogClientService(host, Constants.RPC_PORT);
-    String log = logClient.rollViewLog(taskInstance.getLogPath(),skipLineNum,limit);
-    result.setData(log);
-    logger.info(log);
+    LogClientService logClient = null;
+    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);
-    return logClient.getLogBytes(taskInstance.getLogPath());
+    LogClientService logClient = null;
+    try {
+      logClient = new LogClientService(host, Constants.RPC_PORT);
+      return logClient.getLogBytes(taskInstance.getLogPath());
+    } finally {
+      if(logClient != null){
+        logClient.close();
+      }
+    }
   }
 }
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 3e9dcb026e..ccbbc36ea4 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -27,7 +27,6 @@ import org.apache.dolphinscheduler.common.enums.*;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.FileUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.dao.entity.*;
 import org.apache.dolphinscheduler.dao.mapper.*;
 import org.apache.dolphinscheduler.service.process.ProcessService;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
index 69284ee69c..90711e1d14 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
+++ b/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);
-
-      String log = logClient.viewLog(taskInstance.getLogPath());
+      LogClientService logClient = null;
+      String log = null;
+      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();
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogClientService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogClientService.java
index a316c7046d..aa6999ef0d 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogClientService.java
+++ b/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");
     }
 
     /**