Skip to content

Commit 17f787c

Browse files
jinyangraojinyangrao
committed
Fix the problem that appconn execution engine status does not flip.
1 parent 1e04a47 commit 17f787c

File tree

3 files changed

+103
-1
lines changed

3 files changed

+103
-1
lines changed

‎dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,6 @@ spring.spring.servlet.multipart.max-file-size=200MB
5050
spring.spring.servlet.multipart.max-request-size=200MB
5151

5252
wds.linkis.engineconn.support.parallelism=true
53-
wds.linkis.engineconn.max.free.time=0
53+
wds.linkis.engineconn.max.free.time=0
54+
55+
wds.linkis.default.computation.executormanager.clazz=org.apache.linkis.manager.engineplugin.appconn.executor.AppConnComputationExecutorManagerImpl

‎dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2019 WeBank
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
~
16+
-->
17+
18+
<configuration status="error" monitorInterval="30">
19+
<appenders>
20+
<Console name="Console" target="SYSTEM_OUT">
21+
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
22+
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
23+
</Console>
24+
<Send name="Send" >
25+
<Filters>
26+
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
27+
</Filters>
28+
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
29+
</Send>
30+
<File name="stderr" fileName="${env:PWD}/logs/stderr" append="true">
31+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
32+
</File>
33+
</appenders>
34+
<loggers>
35+
<root level="INFO">
36+
<appender-ref ref="Console"/>
37+
<appender-ref ref="Send"/>
38+
</root>
39+
<logger name="org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter " level="error" additivity="true">
40+
<appender-ref ref="stderr"/>
41+
</logger>
42+
<logger name="com.netflix.discovery" level="warn" additivity="true">
43+
<appender-ref ref="Send"/>
44+
</logger>
45+
<logger name="org.apache.hadoop.yarn" level="warn" additivity="true">
46+
<appender-ref ref="Send"/>
47+
</logger>
48+
<logger name="org.springframework" level="warn" additivity="true">
49+
<appender-ref ref="Send"/>
50+
</logger>
51+
<logger name="org.apache.linkis.server.security" level="warn" additivity="true">
52+
<appender-ref ref="Send"/>
53+
</logger>
54+
<logger name="org.apache.hadoop.hive.ql.exec.mr.ExecDriver" level="fatal" additivity="true">
55+
<appender-ref ref="Send"/>
56+
</logger>
57+
<logger name="org.apache.hadoop.hdfs.KeyProviderCache" level="fatal" additivity="true">
58+
<appender-ref ref="Send"/>
59+
</logger>
60+
<logger name="org.spark_project.jetty" level="ERROR" additivity="true">
61+
<appender-ref ref="Send"/>
62+
</logger>
63+
<logger name="org.eclipse.jetty" level="ERROR" additivity="true">
64+
<appender-ref ref="Send"/>
65+
</logger>
66+
<logger name="org.springframework" level="ERROR" additivity="true">
67+
<appender-ref ref="Send"/>
68+
</logger>
69+
<logger name="org.reflections.Reflections" level="ERROR" additivity="true">
70+
<appender-ref ref="Send"/>
71+
</logger>
72+
73+
</loggers>
74+
</configuration>

‎dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnComputationExecutorManagerImpl.scala

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*
15+
*/
16+
17+
package org.apache.linkis.manager.engineplugin.appconn.executor
18+
19+
import org.apache.linkis.engineconn.computation.executor.creation.ComputationExecutorManagerImpl
20+
import org.apache.linkis.manager.label.entity.Label
21+
22+
23+
class AppConnComputationExecutorManagerImpl extends ComputationExecutorManagerImpl {
24+
25+
override protected def getLabelKey(labels: Array[Label[_]]): String = "appconn"
26+
}

0 commit comments

Comments
 (0)