Merge pull request #983 from WeBankFinTech/dev-1.0.2

[release] Prepare for release Linkis-1.0.2
apache · Sep 2, 2021 · f96b41e · f96b41e
2 parents b905255 + 92a1608
commit f96b41e
Show file tree

Hide file tree

Showing 273 changed files with 10,903 additions and 562 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,10 @@ linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/acces
 linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/callback-service/target/
 linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/target/
 linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/resource-executor/target/
+linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/target/
+linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/target/
+
+
 linkis-computation-governance/linkis-entrance-client/target/
 linkis-computation-governance/linkis-entrance/target/
 linkis-computation-governance/linkis-manager/label-common/target/
@@ -78,6 +82,15 @@ linkis-public-enhancements/linkis-publicService/linkis-script-dev/linkis-storage
 linkis-public-enhancements/linkis-publicService/linkis-udf/target/
 linkis-public-enhancements/linkis-publicService/linkis-variable/target/
 linkis-public-enhancements/linkis-publicService/target/
+linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/target/
+linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/target/
+linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/target/
+linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/target/
+linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/target/
+linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/target/
+linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/target/
+linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/target/
+
 
 
 linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/target/
@@ -100,10 +113,18 @@ linkis-engineconn-plugins/engineconn-plugins/python/target/
 linkis-engineconn-plugins/engineconn-plugins/spark/target/
 linkis-engineconn-plugins/engineconn-plugins/pipeline/target/
 linkis-engineconn-plugins/engineconn-plugins/shell/target/
+linkis-engineconn-plugins/engineconn-plugins/flink/target/
 
 linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/target/
+linkis-orchestrator/linkis-code-orchestrator/target/
+linkis-orchestrator/linkis-computation-orchestrator/target/
+linkis-orchestrator/linkis-orchestrator-core/target/
 
 assembly/target
 assembly/public-module/target/
+assembly-combined-package/assembly-combined/public-module-combined/target/
+assembly-combined-package/assembly-combined/target/
+assembly-combined-package/target/
 
+linkis-extensions/linkis-io-file-client/target/
 
diff --git a/assembly-combined-package/assembly-combined/pom.xml b/assembly-combined-package/assembly-combined/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -75,4 +75,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/assembly-combined-package/assembly-combined/public-module-combined/pom.xml b/assembly-combined-package/assembly-combined/public-module-combined/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-common-start b/assembly-combined-package/assembly-combined/sbin/ext/linkis-common-start
@@ -29,6 +29,12 @@ then
   export SERVER_JAVA_OPTS=" -DserviceName=$SERVER_NAME -Xmx$SERVER_HEAP_SIZE -XX:+UseG1GC -Xloggc:$LINKIS_LOG_DIR/${SERVER_NAME}-gc.log $DEBUG_CMD "
 fi
 
+#SPRING_ARGS
+if [ "$EUREKA_PREFER_IP" == "true" ]; then
+  SPRING_ARGS="$SPRING_ARGS --eureka.instance.prefer-ip-address=true "
+  SPRING_ARGS="$SPRING_ARGS --eureka.instance.instance-id=\${spring.cloud.client.ip-address}:\${spring.application.name}:\${server.port}"
+fi
+
 ## conf dir
 export SERVER_CONF_PATH=$LINKIS_CONF_DIR
 

diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-gateway b/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-gateway
@@ -36,6 +36,14 @@ fi
 
 export SERVER_CLASS=com.webank.wedatasphere.linkis.gateway.springcloud.LinkisGatewayApplication
 
+
+#SPRING_ARGS
+if [ "$EUREKA_PREFER_IP" == "true" ]; then
+  SPRING_ARGS="$SPRING_ARGS --eureka.instance.prefer-ip-address=true "
+  SPRING_ARGS="$SPRING_ARGS --eureka.instance.instance-id=\${spring.cloud.client.ip-address}:\${spring.application.name}:\${server.port} "
+fi
+
+
 ## conf dir
 export SERVER_CONF_PATH=$LINKIS_CONF_DIR
 

diff --git a/assembly-combined-package/config/linkis-env.sh b/assembly-combined-package/config/linkis-env.sh
@@ -85,7 +85,7 @@ SPARK_CONF_DIR=/appcom/config/spark-config
 ###  You can access it in your browser at the address below:http://${EUREKA_INSTALL_IP}:${EUREKA_PORT}
 #EUREKA_INSTALL_IP=127.0.0.1         # Microservices Service Registration Discovery Center
 EUREKA_PORT=20303
-EUREKA_PREFER_IP=true
+export EUREKA_PREFER_IP=false
 
 ###  Gateway install information
 #GATEWAY_INSTALL_IP=127.0.0.1
@@ -130,7 +130,7 @@ export SERVER_HEAP_SIZE="512M"
 ##The decompression directory and the installation directory need to be inconsistent
 LINKIS_HOME=/appcom/Install/LinkisInstall
 
-LINKIS_VERSION=1.0.1
+LINKIS_VERSION=1.0.2
 
 # for install
-LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
+LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
diff --git a/assembly-combined-package/pom.xml b/assembly-combined-package/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-commons/linkis-common/pom.xml b/linkis-commons/linkis-common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...nkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala b/...nkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala
@@ -38,6 +38,8 @@ object Configuration extends Logging {
 
   val CLOUD_CONSOLE_VARIABLE_SPRING_APPLICATION_NAME = CommonVars("wds.linkis.console.variable.application.name", "linkis-ps-publicservice")
 
+  //read from env
+  val EUREKA_PREFER_IP = CommonVars("EUREKA_PREFER_IP", false).getValue
 
   def getGateWayURL(): String = {
     val url = GATEWAY_URL.getValue.trim

diff --git a/linkis-commons/linkis-hadoop-common/pom.xml b/linkis-commons/linkis-hadoop-common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-commons/linkis-httpclient/pom.xml b/linkis-commons/linkis-httpclient/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-commons/linkis-message-scheduler/pom.xml b/linkis-commons/linkis-message-scheduler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../linkis-module/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java b/.../linkis-module/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java
@@ -139,11 +139,17 @@ private static void addOrUpdateRemoteConfig(Environment env, boolean isUpdateOrN
     }
 
     private static void initDWCApplication() {
+        String hostName = Utils.getComputerName();
+        boolean eurekaPreferIp = Configuration.EUREKA_PREFER_IP();
+        if(eurekaPreferIp){
+            hostName = applicationContext.getEnvironment().getProperty("spring.cloud.client.ip-address");
+            logger.info("using ip address replace hostname,beacause eureka.instance.prefer-ip-address:" + eurekaPreferIp);
+        }
         serviceInstance = new ServiceInstance();
         serviceInstance.setApplicationName(applicationContext.getEnvironment().getProperty("spring.application.name"));
-        serviceInstance.setInstance(Utils.getComputerName() + ":" + applicationContext.getEnvironment().getProperty("server.port"));
+        serviceInstance.setInstance(hostName + ":" + applicationContext.getEnvironment().getProperty("server.port"));
         LinkisException.setApplicationName(serviceInstance.getApplicationName());
-        LinkisException.setHostname(Utils.getComputerName());
+        LinkisException.setHostname(hostName);
         LinkisException.setHostPort(Integer.parseInt(applicationContext.getEnvironment().getProperty("server.port")));
     }
 

diff --git a/linkis-commons/linkis-mybatis/pom.xml b/linkis-commons/linkis-mybatis/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/linkis-commons/linkis-protocol/pom.xml b/linkis-commons/linkis-protocol/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-commons/linkis-rpc/pom.xml b/linkis-commons/linkis-rpc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-commons/linkis-scheduler/pom.xml b/linkis-commons/linkis-scheduler/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>linkis-scheduler</artifactId>
 

diff --git a/linkis-commons/linkis-storage/pom.xml b/linkis-commons/linkis-storage/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis</artifactId>
     </parent>

diff --git a/linkis-commons/pom.xml b/linkis-commons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis-cli</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-cli-application</artifactId>

diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis-cli</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-cli-common</artifactId>

diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.webank.wedatasphere.linkis</groupId>
         <artifactId>linkis-cli</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-cli-core</artifactId>

diff --git a/linkis-computation-governance/linkis-client/linkis-cli/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>linkis-cli</artifactId>
     <packaging>pom</packaging>

diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>linkis</artifactId>
         <groupId>com.webank.wedatasphere.linkis</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>linkis-computation-client</artifactId>
@@ -54,6 +54,12 @@
             <version>${linkis.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.webank.wedatasphere.linkis</groupId>
+            <artifactId>linkis-bml-client</artifactId>
+            <version>${linkis.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...client/src/main/scala/com/webank/wedatasphere/linkis/computation/client/JobListener.scala b/...client/src/main/scala/com/webank/wedatasphere/linkis/computation/client/JobListener.scala
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.webank.wedatasphere.linkis.computation.client
+
+
+trait JobListener {
+
+  def onJobSubmitted(job: LinkisJob): Unit
+
+  def onJobRunning(job: LinkisJob): Unit
+
+  def onJobFinished(job: LinkisJob): Unit
+
+  def onJobUnknownError(job: LinkisJob, t: Throwable): Unit
+
+}