From 77472ff44ecf7754e501568c3c88b942aed1a0cb Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Tue, 22 Aug 2023 19:57:37 +0800
Subject: [PATCH] Fix linkis cli async exeute throw npe close #4869

---
 .../job/interactive/InteractiveJob.java        | 18 +++++++++++++++---
 .../manager/am/restful/EMRestfulApi.java       | 11 ++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
index 9e1733ccf1..1c04a06b5a 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
+++ b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
@@ -41,6 +41,7 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,7 +117,7 @@ public JobResult run() {
     // async job, return
     if (isAsync) {
       return new InteractiveJobResult(
-          submitResult.getJobStatus().isJobSubmitted(),
+          jobInfoResult.getJobStatus().isJobSubmitted(),
           "Async Submission Success",
           new HashMap<>());
     }
@@ -171,7 +172,14 @@ private JobResult getResult(
               "Job status is not success but \'"
                   + jobInfoResult.getJobStatus()
                   + "\'. Will not try to retrieve any Result");
-      return new InteractiveJobResult(false, "Execute Error!!!", new HashMap<>());
+      Map<String, String> extraMap = new HashMap<>();
+      if (jobInfoResult.getErrCode() != null) {
+        extraMap.put("errorCode", String.valueOf(jobInfoResult.getErrCode()));
+      }
+      if (StringUtils.isNotBlank(jobInfoResult.getErrDesc())) {
+        extraMap.put("errorDesc", jobInfoResult.getErrDesc());
+      }
+      return new InteractiveJobResult(false, "Execute Error!!!", extraMap);
     }
     InteractiveJobResult result =
         new InteractiveJobResult(true, "Execute Success!!!", new HashMap<>());
@@ -209,7 +217,8 @@ private LinkisOperResultAdapter waitJobComplete(String user, String jobId)
       // query progress
       try {
         jobInfoResult = oper.queryJobInfo(user, jobId);
-        oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
+        oper.queryJobStatus(
+            jobInfoResult.getUser(), jobInfoResult.getJobID(), jobInfoResult.getStrongerExecId());
       } catch (Exception e) {
         logger.warn("", e);
         retryCnt++;
@@ -246,6 +255,9 @@ public void onDestroy() {
       logger.warn("Failed to kill job username or jobId is blank");
       return;
     }
+    if (isAsync) {
+      return;
+    }
     try {
       new JobKiller(oper).doKill(username, jobId);
     } catch (Exception e) {
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
index c0da8cde24..b1bf62b3ba 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -359,9 +359,14 @@ public Message executeECMOperation(HttpServletRequest req, @RequestBody JsonNode
           "Fail to process the operation parameters, cased by "
               + ExceptionUtils.getRootCauseMessage(e));
     }
-    String engineConnInstance = (String) parameters.get("engineConnInstance");
-    return executeECMOperation(
-        ecmNode, engineConnInstance, new ECMOperateRequest(userName, parameters));
+    if (parameters.containsKey("engineConnInstance")) {
+      return executeECMOperation(
+          ecmNode,
+          parameters.get("engineConnInstance").toString(),
+          new ECMOperateRequest(userName, parameters));
+    } else {
+      return executeECMOperation(ecmNode, "", new ECMOperateRequest(userName, parameters));
+    }
   }
 
   @ApiOperation(value = "openEngineLog", notes = "open Engine log", response = Message.class)