Skip to content

Commit 304fb3f

Browse files
authored
Feat move dss gateway support (#4408)
* feat(linkis-mg): move dss-gateway-support code to linkis
1 parent c516449 commit 304fb3f

File tree

16 files changed

+348
-31
lines changed

16 files changed

+348
-31
lines changed

.github/workflows/build-backend.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name: Build Backend
2020
on: [push, pull_request]
2121

2222
env:
23-
MAVEN_OPTS: -Dmaven.resolver.transport=wagon -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
23+
MAVEN_OPTS: -Dmaven.resolver.transport=wagon -Dmaven.wagon.httpconnectionManager.ttlSeconds=30
2424

2525
jobs:
2626
build-backend:

.mvn/wrapper/maven-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

linkis-dist/package/conf/log4j2.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
-->
1818

1919
<configuration status="error" monitorInterval="30">
20+
<properties>
21+
<property name="LOG_PATH">${env:LINKIS_LOG_DIR:-logs}</property>
22+
<property name="LOG_FILE">${sys:serviceName:-linkis}</property>
23+
</properties>
2024
<appenders>
21-
<RollingFile name="RollingFile" append="true" fileName="${env:LINKIS_LOG_DIR}/${sys:serviceName}.log"
22-
filePattern="${env:LINKIS_LOG_DIR}/$${date:yyyy-MM}/${sys:serviceName}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
25+
<RollingFile name="RollingFile" append="true" fileName="${LOG_PATH}/${LOG_FILE}.log"
26+
filePattern="${LOG_PATH}/$${date:yyyy-MM}/${LOG_FILE}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
2327
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
2428
<Policies>
2529
<SizeBasedTriggeringPolicy size="100MB"/>

linkis-dist/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<artifactId>linkis-dist</artifactId>
2727
<packaging>pom</packaging>
2828

29+
<properties>
30+
<maven.deploy.skip>true</maven.deploy.skip>
31+
<maven.install.skip>true</maven.install.skip>
32+
</properties>
33+
2934
<dependencies>
3035
<dependency>
3136
<groupId>org.apache.linkis</groupId>

linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsMetaService.java

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public Map<String, String> queryConnectionInfo(
7878
HdfsConnection connection, Map<String, String> queryParams) {
7979
List<String> filterRules = new ArrayList<>();
8080
AtomicReference<URI> uriReference = new AtomicReference<>();
81+
LOG.info("query hdfs ConnectionInfo for uri: {}", queryParams.get("uri"));
8182
Optional.ofNullable(queryParams.get("uri"))
8283
.ifPresent(
8384
uri -> {

linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@
2323
<version>${revision}</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
26-
2726
<artifactId>linkis-eureka</artifactId>
2827
<packaging>jar</packaging>
2928

29+
<properties>
30+
<maven.deploy.skip>true</maven.deploy.skip>
31+
<maven.install.skip>true</maven.install.skip>
32+
</properties>
33+
3034
<dependencies>
3135
<dependency>
3236
<groupId>org.springframework.cloud</groupId>
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.linkis.gateway.ujes.route.label
18+
package org.apache.linkis.gateway.parser
1919

2020
import org.apache.linkis.common.utils.{Logging, Utils}
2121
import org.apache.linkis.gateway.http.GatewayContext

linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml

+1-15
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,6 @@
9494
<artifactId>jackson-databind</artifactId>
9595
</dependency>
9696

97-
<!-- https://mavenlibs.com/maven/dependency/com.webank.wedatasphere.dss/dss-gateway-support -->
98-
<dependency>
99-
<groupId>com.webank.wedatasphere.dss</groupId>
100-
<artifactId>dss-gateway-support</artifactId>
101-
<version>1.1.1</version>
102-
<exclusions>
103-
<exclusion>
104-
<groupId>org.apache.linkis</groupId>
105-
<artifactId>linkis-gateway-server-support</artifactId>
106-
</exclusion>
107-
</exclusions>
108-
</dependency>
109-
11097
</dependencies>
11198

11299
<build>
@@ -115,7 +102,6 @@
115102
<groupId>net.alchim31.maven</groupId>
116103
<artifactId>scala-maven-plugin</artifactId>
117104
</plugin>
118-
119105
<plugin>
120106
<groupId>org.apache.maven.plugins</groupId>
121107
<artifactId>maven-assembly-plugin</artifactId>
@@ -126,7 +112,7 @@
126112
<appendAssemblyId>false</appendAssemblyId>
127113
<attach>false</attach>
128114
<descriptors>
129-
<descriptor>/src/main/assembly/distribution.xml</descriptor>
115+
<descriptor>src/main/assembly/distribution.xml</descriptor>
130116
</descriptors>
131117
</configuration>
132118
<executions>

linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml

-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<id>linkis-gateway</id>
2222
<formats>
2323
<format>dir</format>
24-
<format>zip</format>
2524
</formats>
2625
<includeBaseDirectory>false</includeBaseDirectory>
2726
<baseDirectory>linkis-gateway</baseDirectory>
@@ -44,9 +43,5 @@
4443
</dependencySet>
4544
</dependencySets>
4645

47-
<fileSets>
48-
49-
</fileSets>
50-
5146
</assembly>
5247

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.linkis.gateway.dss.parser
19+
20+
import org.apache.linkis.common.conf.CommonVars
21+
22+
object DSSGatewayConfiguration {
23+
val DSS_SPRING_NAME = CommonVars("wds.linkis.dss.name", "dss-server")
24+
25+
val DSS_URL_LABEL_PREFIX = CommonVars("wds.dss.gateway.url.prefix.name", "labels")
26+
27+
val DSS_URL_ROUTE_LABEL_PREFIX = CommonVars("wds.dss.gateway.url.prefix.name", "labelsRoute")
28+
29+
val DSS_URL_APPCONNS = CommonVars("wds.dss.gateway.url.appconns", "visualis")
30+
31+
}

0 commit comments

Comments
 (0)