You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/03/19 04:44:56 UTC
[incubator-linkis] 01/07: Fix ec clear issue #1748
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 07ad1227dd12260ea83cdfb4262774c9fbbd9e3a
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 12:17:27 2022 +0800
Fix ec clear issue #1748
---
.../scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala | 8 ++++++--
.../ecm/server/service/impl/AbstractEngineConnLaunchService.scala | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
index 03c74d0..0025b88 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
@@ -19,8 +19,8 @@ package org.apache.linkis.ecm.core.engineconn
import java.io.Closeable
import java.util
-
import org.apache.linkis.common.ServiceInstance
+import org.apache.linkis.common.utils.Utils
import org.apache.linkis.ecm.core.launch.{EngineConnLaunchRunner, EngineConnManagerEnv}
import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.entity.resource.NodeResource
@@ -70,5 +70,9 @@ trait EngineConn extends Closeable {
def getPid: String
- override def close(): Unit = {}
+ override def close(): Unit = {
+ if (null != getEngineConnLaunchRunner) {
+ Utils.tryQuietly(getEngineConnLaunchRunner.stop())
+ }
+ }
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
index cc70c45..9dcef7a 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
@@ -103,6 +103,7 @@ abstract class AbstractEngineConnLaunchService extends EngineConnLaunchService w
future onComplete {
case Failure(t) =>
logger.error(s"init ${conn.getServiceInstance} failed.${conn.getEngineConnLaunchRunner.getEngineConnLaunch.getEngineConnManagerEnv().engineConnWorkDir}")
+ LinkisECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(conn.getTickedId, Failed))
case Success(_) =>
logger.info(s"init ${conn.getServiceInstance} succeed.${conn.getEngineConnLaunchRunner.getEngineConnLaunch.getEngineConnManagerEnv().engineConnWorkDir}")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org