This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new a682e5486 kill seatunnel run on yarn job (#4743)
a682e5486 is described below
commit a682e54864e981c35f7e2b47b188f9e9c6e7f167
Author: xiutao <[email protected]>
AuthorDate: Wed Jul 5 11:38:54 2023 +0800
kill seatunnel run on yarn job (#4743)
Co-authored-by: shixiutao <[email protected]>
---
.../ecm/server/service/impl/DefaultEngineConnKillService.java | 3 +++
.../apache/linkis/engineconn/common/conf/EngineConnConf.scala | 3 +++
.../seatunnel/src/main/resources/log4j2.xml | 11 +++++++++++
3 files changed, 17 insertions(+)
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
index ce8c76098..440208cd6 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
@@ -185,6 +185,9 @@ public class DefaultEngineConnKillService implements
EngineConnKillService {
case "hive":
regex =
EngineConnConf.HIVE_ENGINE_CONN_YARN_APP_ID_PARSE_REGEX().getValue();
break;
+ case "seatunnel":
+ regex =
EngineConnConf.SEATUNNEL_ENGINE_CONN_YARN_APP_ID_PARSE_REGEX().getValue();
+ break;
default:
regex = "";
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
index 0d7f1cab0..eefc69f5b 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
@@ -79,6 +79,9 @@ object EngineConnConf {
val HIVE_ENGINE_CONN_YARN_APP_ID_PARSE_REGEX =
CommonVars("wds.linkis.hive.engine.yarn.app.id.parse.regex",
"(application_\\d{13}_\\d+)")
+ val SEATUNNEL_ENGINE_CONN_YARN_APP_ID_PARSE_REGEX =
+ CommonVars("wds.linkis.seatunnel.engine.yarn.app.id.parse.regex",
"(application_\\d{13}_\\d+)")
+
def getWorkHome: String =
System.getenv(ENGINE_CONN_LOCAL_PATH_PWD_KEY.getValue)
def getLogDir: String = {
diff --git a/linkis-engineconn-plugins/seatunnel/src/main/resources/log4j2.xml
b/linkis-engineconn-plugins/seatunnel/src/main/resources/log4j2.xml
index 2e36367c4..31d9392f0 100644
--- a/linkis-engineconn-plugins/seatunnel/src/main/resources/log4j2.xml
+++ b/linkis-engineconn-plugins/seatunnel/src/main/resources/log4j2.xml
@@ -38,6 +38,11 @@
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"
/>
<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M
[JobId-%X{jobId}] - %msg%xEx%n"/>
</Console>
+
+ <File name="YarnAppIdOutputFile" append="true"
fileName="${env:LOG_DIRS:-logs}/yarnApp.log">
+ <RegexFilter regex=".*application_.*" onMatch="ACCEPT"
onMismatch="DENY"/>
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level]
[%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
+ </File>
</appenders>
<loggers>
<root level="INFO">
@@ -87,6 +92,12 @@
<logger name="org.apache.hadoop.ipc.Client" level="ERROR"
additivity="true">
<appender-ref ref="Send"/>
</logger>
+ <logger name="com.netflix.util.concurrent.ShutdownEnabledTimer"
level="warn" additivity="true">
+ <appender-ref ref="RollingFile"/>
+ </logger>
+ <logger name="org.apache.hadoop.mapreduce.Job" level="INFO"
additivity="true">
+ <appender-ref ref="YarnAppIdOutputFile"/>
+ </logger>
</loggers>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
