[dev] use text instead of varchar in processorInfo & peDAG

This commit is contained in:
tjq 2020-06-05 09:01:57 +08:00
parent 956cfd4937
commit 310a076fce
5 changed files with 65 additions and 14 deletions

View File

@ -4,7 +4,7 @@ FROM openjdk:8
MAINTAINER tengjiqi@gmail.com MAINTAINER tengjiqi@gmail.com
# 下载并安装 maven # 下载并安装 maven
RUN curl -O https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz RUN curl -O https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/oms-maven RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/oms-maven && rm -rf apache-maven-3.6.3-bin.tar.gz
# 替换 maven 配置文件 # 替换 maven 配置文件
RUN rm -rf /opt/oms-maven/conf/settings.xml RUN rm -rf /opt/oms-maven/conf/settings.xml
COPY settings.xml /opt/oms-maven/conf/settings.xml COPY settings.xml /opt/oms-maven/conf/settings.xml
@ -13,11 +13,11 @@ ENV M2_HOME=/opt/oms-maven
# 设置其他环境变量 # 设置其他环境变量
ENV APP_NAME=oh-my-scheduler-server ENV APP_NAME=oh-my-scheduler-server
# 传递SpringBoot 启动参数 # 传递 SpringBoot 启动参数
ENV PARAMS="" ENV PARAMS=""
# 将应用 jar 包拷入 docker # 将应用 jar 包拷入 docker
COPY oms-server.jar /oms-server.jar COPY oms-server.jar /oms-server.jar
# 暴露端口HTTP + AKKA-Server # 暴露端口HTTP + AKKA
EXPOSE 7700 10086 EXPOSE 7700 10086
# 创建 docker 文件目录(盲猜这是用户目录) # 创建 docker 文件目录(盲猜这是用户目录)
RUN mkdir -p /root/oms-server RUN mkdir -p /root/oms-server

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- 该 maven 配置文件将成为 oms-server 所使用的 maven 配置文件 -->
<!-- The maven configuration file will become the maven configuration file used by oms-server -->
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file

View File

@ -52,7 +52,9 @@ public class JobInfoDO {
private Integer executeType; private Integer executeType;
// 执行器类型Java/Shell // 执行器类型Java/Shell
private Integer processorType; private Integer processorType;
// 执行器信息 // 执行器信息可能需要存储整个脚本文件
@Lob
@Column(columnDefinition="TEXT")
private String processorInfo; private String processorInfo;
/* ************************** 运行时配置 ************************** */ /* ************************** 运行时配置 ************************** */

View File

@ -31,6 +31,8 @@ public class WorkflowInfoDO {
private Long appId; private Long appId;
// 工作流的DAG图信息点线式DAG的json // 工作流的DAG图信息点线式DAG的json
@Lob
@Column(columnDefinition="TEXT")
private String peDAG; private String peDAG;
/* ************************** 定时参数 ************************** */ /* ************************** 定时参数 ************************** */

View File

@ -9,8 +9,9 @@
Target Server Version : 50724 Target Server Version : 50724
File Encoding : 65001 File Encoding : 65001
Date: 20/05/2020 16:28:20 Date: 03/06/2020 22:58:32
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0; SET FOREIGN_KEY_CHECKS = 0;
@ -27,7 +28,7 @@ CREATE TABLE `app_info` (
`gmt_modified` datetime(6) DEFAULT NULL, `gmt_modified` datetime(6) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `appNameUK` (`app_name`) UNIQUE KEY `appNameUK` (`app_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-- ---------------------------- -- ----------------------------
-- Table structure for container_info -- Table structure for container_info
@ -45,8 +46,8 @@ CREATE TABLE `container_info` (
`status` int(11) DEFAULT NULL, `status` int(11) DEFAULT NULL,
`version` varchar(255) DEFAULT NULL, `version` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `containerNameUK` (`container_name`) KEY `IDX8hixyaktlnwil2w9up6b0p898` (`app_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-- ---------------------------- -- ----------------------------
-- Table structure for instance_info -- Table structure for instance_info
@ -61,17 +62,19 @@ CREATE TABLE `instance_info` (
`gmt_create` datetime(6) DEFAULT NULL, `gmt_create` datetime(6) DEFAULT NULL,
`gmt_modified` datetime(6) DEFAULT NULL, `gmt_modified` datetime(6) DEFAULT NULL,
`instance_id` bigint(20) DEFAULT NULL, `instance_id` bigint(20) DEFAULT NULL,
`instance_params` varchar(255) DEFAULT NULL, `instance_params` text,
`job_id` bigint(20) DEFAULT NULL, `job_id` bigint(20) DEFAULT NULL,
`result` varchar(255) DEFAULT NULL, `result` text,
`running_times` bigint(20) DEFAULT NULL, `running_times` bigint(20) DEFAULT NULL,
`status` int(11) NOT NULL, `status` int(11) NOT NULL,
`task_tracker_address` varchar(255) DEFAULT NULL, `task_tracker_address` varchar(255) DEFAULT NULL,
`type` int(11) DEFAULT NULL,
`wf_instance_id` bigint(20) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `IDX5b1nhpe5je7gc5s1ur200njr7` (`job_id`), KEY `IDX5b1nhpe5je7gc5s1ur200njr7` (`job_id`),
KEY `IDXjnji5lrr195kswk6f7mfhinrs` (`app_id`), KEY `IDXjnji5lrr195kswk6f7mfhinrs` (`app_id`),
KEY `IDXa98hq3yu0l863wuotdjl7noum` (`instance_id`) KEY `IDXa98hq3yu0l863wuotdjl7noum` (`instance_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8mb4;
-- ---------------------------- -- ----------------------------
-- Table structure for job_info -- Table structure for job_info
@ -97,7 +100,7 @@ CREATE TABLE `job_info` (
`min_memory_space` double NOT NULL, `min_memory_space` double NOT NULL,
`next_trigger_time` bigint(20) DEFAULT NULL, `next_trigger_time` bigint(20) DEFAULT NULL,
`notify_user_ids` varchar(255) DEFAULT NULL, `notify_user_ids` varchar(255) DEFAULT NULL,
`processor_info` varchar(255) DEFAULT NULL, `processor_info` text,
`processor_type` int(11) DEFAULT NULL, `processor_type` int(11) DEFAULT NULL,
`status` int(11) DEFAULT NULL, `status` int(11) DEFAULT NULL,
`task_retry_num` int(11) DEFAULT NULL, `task_retry_num` int(11) DEFAULT NULL,
@ -105,7 +108,7 @@ CREATE TABLE `job_info` (
`time_expression_type` int(11) DEFAULT NULL, `time_expression_type` int(11) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `IDXk2xprmn3lldmlcb52i36udll1` (`app_id`) KEY `IDXk2xprmn3lldmlcb52i36udll1` (`app_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
-- ---------------------------- -- ----------------------------
-- Table structure for oms_lock -- Table structure for oms_lock
@ -120,7 +123,7 @@ CREATE TABLE `oms_lock` (
`ownerip` varchar(255) DEFAULT NULL, `ownerip` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `lockNameUK` (`lock_name`) UNIQUE KEY `lockNameUK` (`lock_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4;
-- ---------------------------- -- ----------------------------
-- Table structure for server_info -- Table structure for server_info
@ -150,4 +153,45 @@ CREATE TABLE `user_info` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- ----------------------------
-- Table structure for workflow_info
-- ----------------------------
DROP TABLE IF EXISTS `workflow_info`;
CREATE TABLE `workflow_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`app_id` bigint(20) DEFAULT NULL,
`gmt_create` datetime(6) DEFAULT NULL,
`gmt_modified` datetime(6) DEFAULT NULL,
`max_wf_instance_num` int(11) DEFAULT NULL,
`next_trigger_time` bigint(20) DEFAULT NULL,
`notify_user_ids` varchar(255) DEFAULT NULL,
`pedag` varchar(255) DEFAULT NULL,
`status` int(11) DEFAULT NULL,
`time_expression` varchar(255) DEFAULT NULL,
`time_expression_type` int(11) DEFAULT NULL,
`wf_description` varchar(255) DEFAULT NULL,
`wf_name` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `IDX7uo5w0e3beeho3fnx9t7eiol3` (`app_id`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-- ----------------------------
-- Table structure for workflow_instance_info
-- ----------------------------
DROP TABLE IF EXISTS `workflow_instance_info`;
CREATE TABLE `workflow_instance_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`actual_trigger_time` bigint(20) DEFAULT NULL,
`app_id` bigint(20) DEFAULT NULL,
`dag` text,
`finished_time` bigint(20) DEFAULT NULL,
`gmt_create` datetime(6) DEFAULT NULL,
`gmt_modified` datetime(6) DEFAULT NULL,
`result` text,
`status` int(11) DEFAULT NULL,
`wf_instance_id` bigint(20) DEFAULT NULL,
`workflow_id` bigint(20) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;