code check for merge update

WeDataSphere · Dec 13, 2024 · 398b171 · 398b171
1 parent a1d94e8
commit 398b171
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
@@ -66,6 +66,9 @@
                 <exclude>com.google.guava:guava:jar</exclude>
                 <exclude>com.google.protobuf:protobuf-java:jar</exclude>
                 <exclude>com.ning:async-http-client:jar</exclude>
+                <exclude>com.sun.jersey:jersey-json:jar</exclude>
+                <exclude>com.sun.jersey:jersey-server:jar</exclude>
+                <exclude>com.sun.jersey:jersey-servlet:jar</exclude>
                 <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude>
                 <exclude>commons-beanutils:commons-beanutils:jar</exclude>
                 <exclude>commons-beanutils:commons-beanutils-core:jar</exclude>
@@ -104,6 +107,7 @@
                 <exclude>javax.xml.bind:jaxb-api:jar</exclude>
                 <exclude>javax.xml.stream:stax-api:jar</exclude>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
+                <exclude>org.antlr:antlr-runtime:jar</exclude>
                 <exclude>org.antlr:stringtemplate:jar</exclude>
                 <exclude>org.apache.commons:commons-compress:jar</exclude>
                 <exclude>org.apache.commons:commons-math:jar</exclude>

diff --git a/...src/main/scala/org/apache/linkis/orchestrator/computation/monitor/EngineConnMonitor.scala b/...src/main/scala/org/apache/linkis/orchestrator/computation/monitor/EngineConnMonitor.scala
@@ -29,10 +29,11 @@ import org.apache.linkis.governance.common.protocol.engineconn.{
 import org.apache.linkis.governance.common.utils.GovernanceConstant
 import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
 import org.apache.linkis.manager.common.protocol.node.{RequestNodeStatus, ResponseNodeStatus}
+import org.apache.linkis.manager.label.entity.Label
+import org.apache.linkis.manager.label.utils.LabelUtil
 import org.apache.linkis.orchestrator.computation.conf.ComputationOrchestratorConf
 import org.apache.linkis.orchestrator.computation.execute.{CodeExecTaskExecutor, EngineConnTaskInfo}
 import org.apache.linkis.orchestrator.listener.task.{
-  EngineQuitedUnexpectedlyEvent,
   TaskErrorResponseEvent,
   TaskLogEvent,
   TaskStatusEvent
@@ -201,14 +202,25 @@ object EngineConnMonitor extends Logging {
     executors.foreach { executor =>
       val execTask = executor.getExecTask
       Utils.tryAndError {
+        val labels: Array[Label[_]] = executor.getEngineConnExecutor.getLabels()
+        val engineType: String = LabelUtil.getEngineTypeLabel(labels.toList.asJava).getEngineType
         logger.warn(
           s"Will kill task ${execTask.getIDInfo()} because the engine ${executor.getEngineConnExecutor.getServiceInstance.toString} quited unexpectedly."
         )
-        val event = EngineQuitedUnexpectedlyEvent(
+        val errLog = LogUtils.generateERROR(
+          s"Your job : ${execTask.getIDInfo()} was failed because the ${engineType} engine quitted unexpectedly(任务${execTask
+            .getIDInfo()}失败，" +
+            s"原因是引擎意外退出,可能是复杂任务导致引擎退出，如OOM)."
+        )
+        val logEvent = TaskLogEvent(execTask, errLog)
+        execTask.getPhysicalContext.pushLog(logEvent)
+        val errorResponseEvent = TaskErrorResponseEvent(
           execTask,
-          executor.getEngineConnExecutor.getServiceInstance.toString
+          "task failed，Engine quitted unexpectedly(任务运行失败原因是引擎意外退出,可能是复杂任务导致引擎退出，如OOM)."
         )
-        execTask.getPhysicalContext.broadcastSyncEvent(event)
+        execTask.getPhysicalContext.broadcastSyncEvent(errorResponseEvent)
+        val statusEvent = TaskStatusEvent(execTask, ExecutionNodeStatus.Failed)
+        execTask.getPhysicalContext.broadcastSyncEvent(statusEvent)
       }
     }
   }

diff --git a/...r-core/src/main/scala/org/apache/linkis/orchestrator/conf/OrchestratorConfiguration.scala b/...r-core/src/main/scala/org/apache/linkis/orchestrator/conf/OrchestratorConfiguration.scala
@@ -48,7 +48,7 @@ object OrchestratorConfiguration {
     CommonVars("wds.linkis.orchestrator.execution.task.max.parallelism", 5)
 
   val TASK_RUNNER_MAX_SIZE =
-    CommonVars("wds.linkis.orchestrator.execution.task.runner.max.size", 1000)
+    CommonVars("wds.linkis.orchestrator.execution.task.runner.max.size", 200)
 
   val EXEC_RUNNER_FACTORY_CLASS =
     CommonVars("wds.linkis.orchestrator.exec.task.runner.factory.class", "")

diff --git a/...-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml b/...-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
@@ -70,11 +70,20 @@
                 <exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude>
                 <exclude>jakarta.annotation:jakarta.annotation-api:jar</exclude>
                 <exclude>javax.inject:javax.inject:jar</exclude>
+                <exclude>com.sun.jersey.contribs:jersey-apache-client4:jar</exclude>
+                <exclude>com.sun.jersey:jersey-client:jar</exclude>
+                <exclude>com.sun.jersey:jersey-core:jar</exclude>
+                <exclude>com.sun.jersey:jersey-server:jar</exclude>
+                <exclude>com.sun.jersey:jersey-servlet:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
                 <exclude>joda-time:joda-time:jar</exclude>
                 <exclude>com.google.code.findbugs:jsr305:jar</exclude>
                 <exclude>org.slf4j:jul-to-slf4j:jar</exclude>
                 <exclude>com.google.guava:listenablefuture:jar</exclude>
+                <exclude>org.apache.logging.log4j:log4j-api:jar</exclude>
+                <exclude>org.apache.logging.log4j:log4j-core:jar</exclude>
+                <exclude>org.apache.logging.log4j:log4j-jul:jar</exclude>
+                <exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>io.micrometer:micrometer-core:jar</exclude>
                 <exclude>com.netflix.netflix-commons:netflix-commons-util:jar</exclude>
                 <exclude>com.netflix.netflix-commons:netflix-eventbus:jar</exclude>