moidfy dependency in tis-datax-local-executor and tis-datax-executor

datavane · Mar 29, 2024 · cf7db75 · cf7db75
1 parent e441984
commit cf7db75
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -109,7 +109,6 @@ TIS基于数据库元数据信息自动生成Flink-SQL脚本,您没看错全部
 - TIS 插件 [https://github.com/qlangtech/plugins](https://github.com/qlangtech/plugins)
 - TIS 插件元数据生成工具 [https://github.com/qlangtech/update-center2](https://github.com/qlangtech/update-center2)
 - DataX [https://github.com/qlangtech/DataX](https://github.com/qlangtech/DataX)
-- tis-logback-flume-appender [https://github.com/baisui1981/tis-logback-flume-appender](https://github.com/baisui1981/tis-logback-flume-appender)
 - Flink Extend [https://github.com/qlangtech/flink](https://github.com/qlangtech/flink)
 - TIS 插件功能脚手架 [https://github.com/qlangtech/tis-archetype-plugin](https://github.com/qlangtech/tis-archetype-plugin)
 - Chunjun [https://github.com/qlangtech/chunjun](https://github.com/qlangtech/chunjun)

diff --git a/pom.xml b/pom.xml
@@ -195,18 +195,7 @@
  <version>${log4j-to-slf4j.version}</version>
  </dependency>
 
- <dependency>
- <groupId>com.qlangtech.tis</groupId>
- <artifactId>tis-logback-flume-appender</artifactId>
- <classifier>shaded</classifier>
- <version>${tis-logback-flume.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
 
  <dependency>
  <groupId>commons-configuration</groupId>

diff --git a/tis-console.yaml b/tis-console.yaml
@@ -153,7 +153,7 @@ spec:
  mountPath: /opt/app/tis-uber/tis-assemble/conf/tis-web-config/
  - name: tis-console-pvc
  mountPath: "/opt/data"
- image: registry.cn-hangzhou.aliyuncs.com/tis/tis-console:4.0.0.6
+ image: registry.cn-hangzhou.aliyuncs.com/tis/tis-console:4.0.0.7
  # command: [ "/bin/sh", "-c", "sleep 1000000" ]
  ports:
  - name: tis-8080

diff --git a/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java b/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java
@@ -26,7 +26,11 @@
 import com.qlangtech.tis.fullbuild.phasestatus.impl.DumpPhaseStatus.TableDumpStatus;
 import com.qlangtech.tis.fullbuild.phasestatus.impl.JoinPhaseStatus;
 import com.qlangtech.tis.job.common.JobParams;
-import com.qlangtech.tis.realtime.yarn.rpc.*;
+import com.qlangtech.tis.realtime.yarn.rpc.IncrStatusUmbilicalProtocol;
+import com.qlangtech.tis.realtime.yarn.rpc.LaunchReportInfo;
+import com.qlangtech.tis.realtime.yarn.rpc.MasterJob;
+import com.qlangtech.tis.realtime.yarn.rpc.PingResult;
+import com.qlangtech.tis.realtime.yarn.rpc.UpdateCounterMap;
 import com.qlangtech.tis.rpc.grpc.log.DefaultLoggerAppenderClient;
 import com.qlangtech.tis.rpc.grpc.log.ILogReporter;
 import com.qlangtech.tis.rpc.grpc.log.ILoggerAppenderClient;
@@ -52,7 +56,6 @@
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -101,6 +104,7 @@ public static RpcServiceReference getService(ITISCoordinator zookeeper, AdapterA
  if (instance == null) {
  StatusRpcClientFactory clientFactory = new StatusRpcClientFactory();
  instance = clientFactory.connect2RemoteIncrStatusServer(zookeeper, callbacks);
+ AssembleSvcCompsite.statusRpc = instance;
  }
 
  }
@@ -332,6 +336,15 @@ public interface AssembleSvcCompsiteCallback {
  */
  public abstract static class AssembleSvcCompsite implements ITISRpcService {
 
+ public static RpcServiceReference statusRpc;// = new AtomicReference<>();
+
+ static {
+ AtomicReference<ITISRpcService> ref = new AtomicReference<>();
+ ref.set(StatusRpcClientFactory.AssembleSvcCompsite.MOCK_PRC);
+ statusRpc = new RpcServiceReference(ref, () -> {
+ });
+ }
+
  public static final AssembleSvcCompsite MOCK_PRC
  = new AssembleSvcCompsite(new MockIncrStatusUmbilicalProtocol(), new MockLogReporter(), new ILoggerAppenderClient() {
  @Override

diff --git a/tis-manage-pojo/src/main/java/com/qlangtech/tis/datax/DataXJobInfo.java b/tis-manage-pojo/src/main/java/com/qlangtech/tis/datax/DataXJobInfo.java
@@ -31,7 +31,7 @@
  * @create: 2022-12-24 10:48
  **/
 public class DataXJobInfo {
-
+ public static int DATAX_THREAD_PROCESSING_CANCAL_EXITCODE = 943;
  private static final String FILENAME_SPLIT_CHAR = "/";
  private static final String TAB_SPLIT_CHAR = ",";
  private static DataXJobInfo currJobInfo;

diff --git a/tis-test-mysql.yaml b/tis-test-mysql.yaml
@@ -9,6 +9,10 @@ spec:
  app: mysql
  serviceName: mysql-svc
  template:
+ metadata:
+ name: mysql
+ labels:
+ app: mysql
  spec:
  containers:
  - env:
@@ -26,3 +30,19 @@ spec:
  cpu: "2"
  memory: 4Gi
  terminationGracePeriodSeconds: 3
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: mysql-svc
+spec:
+ ports:
+ - name: mysql-svc
+ nodePort: 32005
+ port: 3306
+ protocol: TCP
+ targetPort: 3306
+ selector:
+ app: mysql
+ type: LoadBalancer
+
diff --git a/tis-web-config/config.properties b/tis-web-config/config.properties
@@ -30,8 +30,8 @@ tis.datasource.type=derby
 tis.datasource.dbname=tis_console_db
 
 
-assemble.host=192.168.28.125
-tis.host=192.168.28.125
+assemble.host=192.168.28.127
+tis.host=192.168.28.127