[LinkisManager] Fix create EneingNode throw NPE

linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java

@@ -113,11 +113,14 @@ public EngineNode getEngineNodeInfo(EngineNode engineNode) {
 
   @Override
   public EngineNode getEngineNodeInfoByDB(EngineNode engineNode) {
-    // 1. 从持久化器中获取EngineNode信息，需要获取Task信息和Status信息，方便后面使用
-    engineNode = nodeManagerPersistence.getEngineNode(engineNode.getServiceInstance());
+    EngineNode dbEngineNode = nodeManagerPersistence.getEngineNode(engineNode.getServiceInstance());
+    if (null == dbEngineNode) {
+      throw new LinkisRetryException(
+          AMConstant.ENGINE_ERROR_CODE, engineNode + " not exists in db");
+    }
     metricsConverter.fillMetricsToNode(
-        engineNode, nodeMetricManagerPersistence.getNodeMetrics(engineNode));
-    return engineNode;
+        dbEngineNode, nodeMetricManagerPersistence.getNodeMetrics(dbEngineNode));
+    return dbEngineNode;
   }
 
   @Override

linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.java

@@ -337,11 +337,7 @@ private List<Label<?>> fromEMGetEngineLabels(List<Label<?>> emLabels) {
   }
 
   private boolean ensuresIdle(EngineNode engineNode, String resourceTicketId) {
-    EngineNode engineNodeInfo =
-        LinkisUtils.tryAndWarnMsg(
-            () -> getEngineNodeManager().getEngineNodeInfoByDB(engineNode),
-            "Failed to from db get engine node info",
-            logger);
+    EngineNode engineNodeInfo = getEngineNodeManager().getEngineNodeInfoByDB(engineNode);
     if (null == engineNodeInfo) {
       return false;
     }
@@ -422,11 +418,13 @@ public EngineNode ensureECAvailable(
       EngineStopRequest stopEngineRequest =
           new EngineStopRequest(engineNode.getServiceInstance(), ManagerUtils.getAdminUser());
       engineStopService.asyncStopEngine(stopEngineRequest);
+      if (t instanceof LinkisRetryException) {
+        throw (LinkisRetryException) t;
+      }
       throw new AMErrorException(
           AMConstant.ENGINE_ERROR_CODE,
-          String.format(
-              "Waiting for %s(%s) initialization failure , now stop it.",
-              engineNode, resourceTicketId));
+          String.format("Waiting for %s(%s) initialization failure", engineNode, resourceTicketId),
+          t);
     }
     return engineNode;
   }

linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineConnStatusCallbackToAM.java

@@ -46,8 +46,6 @@ public String toString() {
         + serviceInstance
         + ", status="
         + status
-        + ", initErrorMsg='"
-        + initErrorMsg
         + ", canRetry="
         + canRetry
         + ")";