[linkis] branch dev-1.4.0 updated: fix: do not clean ec resource and service info when handler ecm close event(#4184) (#4510)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
     new 4b787a438 fix: do not clean ec resource and service info when handler ecm close event(#4184) (#4510)
4b787a438 is described below

commit 4b787a438ade0f4e9ba9369249acf42793b32728
Author: CharlieYan <16...@users.noreply.github.com>
AuthorDate: Mon May 1 00:06:15 2023 +0800

    fix: do not clean ec resource and service info when handler ecm close event(#4184) (#4510)
---
 .../manager/rm/service/impl/DefaultResourceManager.scala     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.scala
index 8c6266528..86ee2e67f 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.scala
@@ -190,8 +190,8 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
   }
 
   /**
-   * The registration method is mainly used to notify all RM nodes (including the node), and the
-   * instance is offline. 该注册方法，主要是用于通知所有的RM节点（包括本节点），下线该实例
+   * The registration method is mainly used to notify all RM nodes , and the instance is offline.
+   * 该注册方法，主要是用于通知所有的RM节点（包括本节点），下线该实例
    */
   override def unregister(serviceInstance: ServiceInstance): Unit = {
 
@@ -199,7 +199,6 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
       LabelBuilderFactoryContext.getLabelBuilderFactory.createLabel(classOf[EMInstanceLabel])
     eMInstanceLabel.setServiceName(serviceInstance.getApplicationName)
     eMInstanceLabel.setInstance(serviceInstance.getInstance)
-    val ecNodes = nodeManagerPersistence.getEngineNodeByEM(serviceInstance).asScala
     val lock = tryLockOneLabel(eMInstanceLabel, -1, Utils.getJvmUser)
     try {
       labelResourceService.removeResourceByLabel(eMInstanceLabel)
@@ -217,13 +216,6 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
       resourceLockService.unLock(lock)
       logger.info(s"Finished to clear ecm resource:${serviceInstance}")
     }
-    ecNodes.foreach { engineNode =>
-      Utils.tryAndWarn {
-        engineNode.setLabels(nodeLabelService.getNodeLabels(engineNode.getServiceInstance))
-        engineNode.setNodeStatus(NodeStatus.Failed)
-        engineStopService.engineConnInfoClear(engineNode)
-      }
-    }
     logger.info(s"Finished to clear ec for ecm ${serviceInstance}")
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org