Fix flink sql kill yarn application and getJobStatus fail (#5041)

* Fix flink getJobStatus bug * Fix flink sql kill yarn application and getJobStatus fail
apache · Dec 14, 2023 · 14e118a · 14e118a
1 parent f811794
commit 14e118a
Show file tree

Hide file tree

Showing 4 changed files with 17 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/.../org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java b/.../org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java
@@ -91,6 +91,15 @@ public ClusterDescriptorAdapter(ExecutionContext executionContext) {
 
   /** Returns the status of the flink job. */
   public JobStatus getJobStatus() throws JobExecutionException {
+    if (jobId == null) {
+      try {
+        LOG.info("flink getJobStatus jobId is null,sleep three seconds");
+        Thread.sleep(3000);
+      } catch (InterruptedException e) {
+
+      }
+    }
+    LOG.info("flink getJobStatus jobId:{}", jobId);
     if (jobId == null) {
       throw new JobExecutionException(NO_JOB_SUBMITTED.getErrorDesc());
     }

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">