Skip to content

Commit a8cd67f

Browse files
liuyou2liuyou2
authored
Merge pull request #823 from JinyangRao/master
dss1.0.1 adopt to linkis1.1.1
2 parents ca8c5be + 4171d14 commit a8cd67f

File tree

11 files changed

+113
-11
lines changed

11 files changed

+113
-11
lines changed

‎conf/dss-framework-orchestrator-server.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
spring.server.port=9203
1919
spring.spring.application.name=dss-framework-orchestrator-server
2020

21-
wds.linkis.test.mode=true
21+
wds.linkis.test.mode=false
2222

2323
wds.linkis.test.user=neiljianliu
2424

‎conf/dss-workflow-server.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
spring.server.port=9207
1919
spring.spring.application.name=dss-workflow-server
2020

21-
wds.linkis.test.mode=true
21+
wds.linkis.test.mode=false
2222

2323
wds.linkis.test.user=neiljianliu
2424

‎conf/dss.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ wds.dss.appconn.scheduler.job.label=dev
3333
wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
3434
spring.spring.mvc.servlet.path=/api/rest_j/v1
3535
spring.spring.servlet.multipart.max-file-size=200MB
36-
spring.spring.servlet.multipart.max-request-size=200MB
36+
spring.spring.servlet.multipart.max-request-size=200MB
37+
38+
wds.linkis.session.ticket.key=bdp-user-ticket-id

‎dss-appconn/linkis-appconn-engineplugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<dependency>
5757
<groupId>org.apache.linkis</groupId>
58-
<artifactId>linkis-message-scheduler</artifactId>
58+
<artifactId>linkis-rpc</artifactId>
5959
<version>${linkis.version}</version>
6060
<exclusions>
6161
<exclusion>

‎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+
}

‎dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.apache.commons.lang.StringUtils;
4747
import org.apache.http.Consts;
4848
import org.apache.ibatis.annotations.Param;
49-
import org.mortbay.log.Log;
5049
import org.slf4j.Logger;
5150
import org.slf4j.LoggerFactory;
5251
import org.springframework.beans.factory.annotation.Autowired;
@@ -245,7 +244,7 @@ public void update(ApiServiceVo apiService) throws Exception {
245244
apiService.setCreator(maxTargetApiVersionVo.getCreator());
246245
apiService.setId(maxTargetApiVersionVo.getApiId());
247246
apiServiceDao.updateToTarget(apiService);
248-
Log.info("Update to other Api Service, ID: " + apiService.getTargetServiceId() + ",resourceId:" + maxTargetApiVersionVo.getBmlResourceId());
247+
LOG.info("Update to other Api Service, ID: " + apiService.getTargetServiceId() + ",resourceId:" + maxTargetApiVersionVo.getBmlResourceId());
249248

250249

251250
String version = updateResult.get("version");

‎dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import io.jsonwebtoken.SignatureException;
3030
import io.jsonwebtoken.UnsupportedJwtException;
3131
import io.jsonwebtoken.impl.crypto.MacProvider;
32-
import org.mortbay.log.Log;
3332
import org.slf4j.Logger;
3433
import org.slf4j.LoggerFactory;
3534
import javax.crypto.SecretKey;
@@ -71,7 +70,7 @@ public final static TemporalAmount getTokenHour() {
7170
public static SecretKey generalKey() {
7271
byte[] encodedKey = Base64.decode(JWT_SECERT);
7372
SecretKey key = new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES");
74-
Log.info("token key str:"+key.toString());
73+
LOG.info("token key str:"+key.toString());
7574
return key;
7675
}
7776

‎dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public Message execute(HttpServletRequest req, @RequestBody Map<String, Object>
7474
// try{
7575
logger.info("Begin to get an execID");
7676
DSSWorkspace workspace = SSOHelper.getWorkspace(req);
77-
json.put(TaskConstant.UMUSER, SecurityFilter.getLoginUsername(req));
77+
json.put(TaskConstant.EXECUTE_USER, SecurityFilter.getLoginUsername(req));
7878
Map<String, Object> params = (Map<String, Object>) json.get("params");
7979
params.put("workspace", workspace);
8080
String label = ((Map<String, Object>) json.get(DSSCommonUtils.DSS_LABELS_KEY)).get("route").toString();

0 commit comments

Comments
 (0)