Fix flink sql kill yarn application and getJobStatus fail

ChengJie1053 · Dec 14, 2023 · c79bb47 · c79bb47
1 parent d914fbd
commit c79bb47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.../org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala b/.../org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -631,7 +631,7 @@ class TaskExecutionServiceImpl
         if (null != task) {
           sendToEntrance(task, ResponseTaskLog(logUpdateEvent.taskId, logUpdateEvent.log))
         } else {
-          logger.error("Task cannot null! logupdateEvent: " + logUpdateEvent.taskId)
+          logger.warn("Task cannot null! logupdateEvent: " + logUpdateEvent.taskId)
         }
       } else if (null != lastTask) {
         val executor = executorManager.getReportExecutor
@@ -733,7 +733,7 @@ class TaskExecutionServiceImpl
     if (null != executor) {
       executor.getTaskById(taskId)
     } else {
-      logger.error(s"Executor of taskId : $taskId is not cached.")
+      logger.warn(s"Executor of taskId : $taskId is not cached.")
       null
     }
   }

diff --git a/...scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkSQLComputationExecutor.scala b/...scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkSQLComputationExecutor.scala
@@ -236,6 +236,11 @@ class FlinkSQLComputationExecutor(
     super.close()
   }
 
+  override def tryShutdown(): Boolean = {
+    Utils.tryAndWarn(close())
+    super.tryShutdown()
+  }
+
 }
 
 class FlinkSQLStatusListener(

diff --git a/linkis-engineconn-plugins/repl/src/main/resources/log4j2.xml b/linkis-engineconn-plugins/repl/src/main/resources/log4j2.xml
@@ -47,7 +47,7 @@
     <loggers>
       <root level="INFO">
             <appender-ref ref="stderr"/>
-            <appender-ref ref="Console"/>
+            <appender-ref ref="RollingFile"/>
             <appender-ref ref="Send"/>
         </root>
         <logger name="org.apache.hadoop.hive.ql.exec.StatsTask" level="info" additivity="true">