spark support yarn cluster

apache · Aug 11, 2023 · e676775 · e676775
1 parent 160ab55
commit e676775
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/...-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java b/...-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java
@@ -129,7 +129,7 @@ public EngineNode getEngineNodeInfoByDB(EngineNode engineNode) {
 
   @Override
   public EngineNode getEngineNodeInfoByTicketId(String ticketId) {
-    EngineNode dbEngineNode = nodeManagerPersistence.getEngineNode(ticketId);
+    EngineNode dbEngineNode = nodeManagerPersistence.getEngineNodeByTicketId(ticketId);
     if (null == dbEngineNode) {
       throw new LinkisRetryException(AMConstant.ENGINE_ERROR_CODE, ticketId + " not exists in db");
     }

diff --git a/...src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.java b/...src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.java
@@ -347,6 +347,10 @@ private boolean ensuresIdle(EngineNode engineNode, String resourceTicketId) {
       return false;
     }
 
+    if (engineNodeInfo.getServiceInstance() != null) {
+      engineNode.setServiceInstance(engineNodeInfo.getServiceInstance());
+    }
+
     if (NodeStatus.isCompleted(engineNodeInfo.getNodeStatus())) {
       NodeMetrics metrics = nodeMetricManagerPersistence.getNodeMetrics(engineNodeInfo);
       Pair<String, Optional<Boolean>> errorInfo = getStartErrorInfo(metrics.getHeartBeatMsg());

diff --git a/...rsistence/src/main/java/org/apache/linkis/manager/persistence/NodeManagerPersistence.java b/...rsistence/src/main/java/org/apache/linkis/manager/persistence/NodeManagerPersistence.java
@@ -105,7 +105,7 @@ void updateEngineNode(ServiceInstance serviceInstance, Node node)
    */
   EngineNode getEngineNode(ServiceInstance serviceInstance);
 
-  EngineNode getEngineNode(String ticketId);
+  EngineNode getEngineNodeByTicketId(String ticketId);
 
   /**
    * 通过Em的ServiceInstance 获取EM下面Engine的列表

diff --git a/...c/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java b/...c/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java
@@ -275,34 +275,24 @@ public EngineNode getEngineNode(ServiceInstance serviceInstance) {
   }
 
   @Override
-  public EngineNode getEngineNode(String ticketId) {
+  public EngineNode getEngineNodeByTicketId(String ticketId) {
     AMEngineNode amEngineNode = new AMEngineNode();
-    //        amEngineNode.setServiceInstance(serviceInstance);
     PersistenceNode engineNode = nodeManagerMapper.getNodeInstanceByTicketId(ticketId);
+
     if (null == engineNode) {
       return null;
     }
+
+    ServiceInstance serviceInstance = new ServiceInstance();
+    serviceInstance.setInstance(engineNode.getInstance());
+    serviceInstance.setApplicationName(engineNode.getName());
+    amEngineNode.setServiceInstance(serviceInstance);
+
     amEngineNode.setOwner(engineNode.getOwner());
     amEngineNode.setMark(engineNode.getMark());
     amEngineNode.setIdentifier(engineNode.getIdentifier());
     amEngineNode.setTicketId(engineNode.getTicketId());
     amEngineNode.setStartTime(engineNode.getCreateTime());
-    //        PersistenceNode emNode =
-    //
-    // nodeManagerMapper.getEMNodeInstanceByEngineNode(serviceInstance.getInstance());
-    //        if (emNode != null) {
-    //            String emInstance = emNode.getInstance();
-    //            String emName = emNode.getName();
-    //            ServiceInstance emServiceInstance = new ServiceInstance();
-    //            emServiceInstance.setApplicationName(emName);
-    //            emServiceInstance.setInstance(emInstance);
-    //            AMEMNode amemNode = new AMEMNode();
-    //            amemNode.setMark(emNode.getMark());
-    //            amemNode.setOwner(emNode.getOwner());
-    //            amemNode.setServiceInstance(emServiceInstance);
-    //            amemNode.setStartTime(emNode.getCreateTime());
-    //            amEngineNode.setEMNode(amemNode);
-    //        }
     return amEngineNode;
   }