diff --git a/docs/zh_CN/1.1.0-release.md b/docs/zh_CN/1.1.0-release.md
new file mode 100644
index 0000000000000000000000000000000000000000..87084169d6ff14ac941c32a5c18b2c8e67afbff1
--- /dev/null
+++ b/docs/zh_CN/1.1.0-release.md
@@ -0,0 +1,55 @@
+Easy Scheduler Release 1.1.0
+===
+Easy Scheduler 1.1.0是1.x系列中的第五个版本。
+
+新特性:
+===
+- [[EasyScheduler-391](https://github.com/analysys/EasyScheduler/issues/391)] run a process under a specified tenement user
+- [[EasyScheduler-288](https://github.com/analysys/EasyScheduler/issues/288)] Feature/qiye_weixin
+- [[EasyScheduler-189](https://github.com/analysys/EasyScheduler/issues/189)] Kerberos等安全支持
+- [[EasyScheduler-398](https://github.com/analysys/EasyScheduler/issues/398)]管理员,有租户(install.sh设置默认租户),可以创建资源、项目和数据源(限制有一个管理员)
+- [[EasyScheduler-293](https://github.com/analysys/EasyScheduler/issues/293)]点击运行流程时候选择的参数,没有地方可查看,也没有保存
+- [[EasyScheduler-401](https://github.com/analysys/EasyScheduler/issues/401)]定时很容易定时每秒一次,定时完成以后可以在页面显示一下下次触发时间
+- [[EasyScheduler-493](https://github.com/analysys/EasyScheduler/pull/493)]add datasource kerberos auth and FAQ modify and add resource upload s3
+
+
+增强:
+===
+- [[EasyScheduler-227](https://github.com/analysys/EasyScheduler/issues/227)] upgrade spring-boot to 2.1.x and spring to 5.x
+- [[EasyScheduler-434](https://github.com/analysys/EasyScheduler/issues/434)] worker节点数量 zk和mysql中不一致
+- [[EasyScheduler-435](https://github.com/analysys/EasyScheduler/issues/435)]邮箱格式的验证
+- [[EasyScheduler-441](https://github.com/analysys/EasyScheduler/issues/441)] 禁止运行节点加入已完成节点检测
+- [[EasyScheduler-400](https://github.com/analysys/EasyScheduler/issues/400)] 首页页面,队列统计不和谐,命令统计无数据
+- [[EasyScheduler-395](https://github.com/analysys/EasyScheduler/issues/395)] 对于容错恢复的流程,状态不能为 **正在运行
+- [[EasyScheduler-529](https://github.com/analysys/EasyScheduler/issues/529)] optimize poll task from zookeeper
+- [[EasyScheduler-242](https://github.com/analysys/EasyScheduler/issues/242)]worker-server节点获取任务性能问题
+- [[EasyScheduler-352](https://github.com/analysys/EasyScheduler/issues/352)]worker 分组, 队列消费问题
+- [[EasyScheduler-461](https://github.com/analysys/EasyScheduler/issues/461)]查看数据源参数,需要加密账号密码信息
+- [[EasyScheduler-396](https://github.com/analysys/EasyScheduler/issues/396)]Dockerfile优化,并关联Dockerfile和github实现自动打镜像
+- [[EasyScheduler-389](https://github.com/analysys/EasyScheduler/issues/389)]service monitor cannot find the change of master/worker
+- [[EasyScheduler-511](https://github.com/analysys/EasyScheduler/issues/511)]support recovery process from stop/kill nodes.
+- [[EasyScheduler-399](https://github.com/analysys/EasyScheduler/issues/399)]HadoopUtils指定用户操作,而不是 **部署用户
+
+修复:
+===
+- [[EasyScheduler-394](https://github.com/analysys/EasyScheduler/issues/394)] master&worker部署在同一台机器上时,如果重启master&worker服务,会导致之前调度的任务无法继续调度
+- [[EasyScheduler-469](https://github.com/analysys/EasyScheduler/issues/469)]Fix naming errors,monitor page
+- [[EasyScheduler-392](https://github.com/analysys/EasyScheduler/issues/392)]Feature request: fix email regex check
+- [[EasyScheduler-405](https://github.com/analysys/EasyScheduler/issues/405)]定时修改/添加页面,开始时间和结束时间不能相同
+- [[EasyScheduler-517](https://github.com/analysys/EasyScheduler/issues/517)]补数 - 子工作流 - 时间参数
+- [[EasyScheduler-532](https://github.com/analysys/EasyScheduler/issues/532)]python节点不执行的问题
+- [[EasyScheduler-543](https://github.com/analysys/EasyScheduler/issues/543)]optimize datasource connection params safety
+- [[EasyScheduler-569](https://github.com/analysys/EasyScheduler/issues/569)]定时任务无法真正停止
+- [[EasyScheduler-463](https://github.com/analysys/EasyScheduler/issues/463)]邮箱验证不支持非常见后缀邮箱
+
+
+
+
+感谢:
+===
+最后但最重要的是,没有以下伙伴的贡献就没有新版本的诞生:
+
+Baoqi, jimmy201602, samz406, petersear, millionfor, hyperknob, fanguanqun, yangqinlong, qq389401879, chgxtony, Stanfan, lfyee, thisnew, hujiang75277381, sunnyingit, lgbo-ustc, ivivi, lzy305, JackIllkid, telltime, lipengbo2018, wuchunfu, telltime
+
+以及微信群里众多的热心伙伴!在此非常感谢!
+
diff --git a/docs/zh_CN/SUMMARY.md b/docs/zh_CN/SUMMARY.md
index 064657756096d27ef777cd2e74f853c7c115a224..d69f530cd0c3138eee29b4894356b7ec543aef52 100644
--- a/docs/zh_CN/SUMMARY.md
+++ b/docs/zh_CN/SUMMARY.md
@@ -35,6 +35,7 @@
* 系统版本升级文档
* [版本升级](升级文档.md)
* 历次版本发布内容
+ * [1.1.0 release](1.1.0-release.md)
* [1.0.3 release](1.0.3-release.md)
* [1.0.2 release](1.0.2-release.md)
* [1.0.1 release](1.0.1-release.md)
diff --git a/docs/zh_CN/book.json b/docs/zh_CN/book.json
index 29a67ac1092058aa073005247e820e6bad684c79..5857eb9138aae762e4349e4ec03a29b4ae4b5872 100644
--- a/docs/zh_CN/book.json
+++ b/docs/zh_CN/book.json
@@ -1,6 +1,6 @@
{
"title": "调度系统-EasyScheduler",
- "author": "YIGUAN",
+ "author": "",
"description": "调度系统",
"language": "zh-hans",
"gitbook": "3.2.3",
diff --git a/docs/zh_CN/images/hive_kerberos.png b/docs/zh_CN/images/hive_kerberos.png
new file mode 100644
index 0000000000000000000000000000000000000000..1532934f928d6b3d0d74c330523343878b5ed7c6
Binary files /dev/null and b/docs/zh_CN/images/hive_kerberos.png differ
diff --git a/docs/zh_CN/images/sparksql_kerberos.png b/docs/zh_CN/images/sparksql_kerberos.png
new file mode 100644
index 0000000000000000000000000000000000000000..761279b3013d94a0a58fe9a24f907806ded274fb
Binary files /dev/null and b/docs/zh_CN/images/sparksql_kerberos.png differ
diff --git "a/docs/zh_CN/\347\263\273\347\273\237\344\275\277\347\224\250\346\211\213\345\206\214.md" "b/docs/zh_CN/\347\263\273\347\273\237\344\275\277\347\224\250\346\211\213\345\206\214.md"
index fc0e999118aea45cefd3561b8efbea0b740d980c..b4d6d6bd9b0ab43a783c32e1be85858bcf5e1d73 100644
--- "a/docs/zh_CN/\347\263\273\347\273\237\344\275\277\347\224\250\346\211\213\345\206\214.md"
+++ "b/docs/zh_CN/\347\263\273\347\273\237\344\275\277\347\224\250\346\211\213\345\206\214.md"
@@ -60,7 +60,7 @@
### 执行流程定义
- **未上线状态的流程定义可以编辑,但是不可以运行**,所以先上线工作流
> 点击工作流定义,返回流程定义列表,点击”上线“图标,上线工作流定义。
-
+
> "下线"工作流之前,要先将定时管理的定时下线,才能成功下线工作流定义
- 点击”运行“,执行工作流。运行参数说明:
@@ -98,28 +98,28 @@
### 查看流程实例
> 点击“工作流实例”,查看流程实例列表。
-
+
> 点击工作流名称,查看任务执行状态。
-
+
> 点击任务节点,点击“查看日志”,查看任务执行日志。
-
+
-
+
> 点击任务实例节点,点击**查看历史**,可以查看该流程实例运行的该任务实例列表
-
+
> 对工作流实例的操作:
-
+
@@ -165,7 +165,7 @@
- 密码:设置连接MySQL的密码
- 数据库名:输入连接MySQL的数据库名称
- Jdbc连接参数:用于MySQL连接的参数设置,以JSON形式填写
-
+
@@ -191,7 +191,7 @@
#### 创建、编辑HIVE数据源
1.使用HiveServer2方式连接
-
+
@@ -207,12 +207,20 @@
- Jdbc连接参数:用于HIVE连接的参数设置,以JSON形式填写
2.使用HiveServer2 HA Zookeeper方式连接
-
+
+注意:如果开启了**kerberos**,则需要填写 **Principal**
+
+
+
+
+
+
+
#### 创建、编辑Spark数据源
@@ -229,9 +237,17 @@
- 数据库名:输入连接Spark的数据库名称
- Jdbc连接参数:用于Spark连接的参数设置,以JSON形式填写
+
+
+注意:如果开启了**kerberos**,则需要填写 **Principal**
+
+
+
+
+
### 上传资源
- 上传资源文件和udf函数,所有上传的文件和资源都会被存储到hdfs上,所以需要以下配置项:
-
+
```
conf/common/common.properties
-- hdfs.startup.state=true
@@ -242,7 +258,7 @@ conf/common/hadoop.properties
```
#### 文件管理
-
+
> 是对各种资源文件的管理,包括创建基本的txt/log/sh/conf等文件、上传jar包等各种类型文件,以及编辑、下载、删除等操作。
@@ -287,7 +303,7 @@ conf/common/hadoop.properties
#### 资源管理
> 资源管理和文件管理功能类似,不同之处是资源管理是上传的UDF函数,文件管理上传的是用户程序,脚本及配置文件
-
+
* 上传udf资源
> 和上传文件相同。
@@ -303,7 +319,7 @@ conf/common/hadoop.properties
- 参数:用来标注函数的输入参数
- 数据库名:预留字段,用于创建永久UDF函数
- UDF资源:设置创建的UDF对应的资源文件
-
+
@@ -312,7 +328,7 @@ conf/common/hadoop.properties
- 安全中心是只有管理员账户才有权限的功能,有队列管理、租户管理、用户管理、告警组管理、worker分组、令牌管理等功能,还可以对资源、数据源、项目等授权
- 管理员登录,默认用户名密码:admin/escheduler123
-
+
### 创建队列
- 队列是在执行spark、mapreduce等程序,需要用到“队列”参数时使用的。
- “安全中心”->“队列管理”->“创建队列”
@@ -357,7 +373,7 @@ conf/common/hadoop.properties
### 令牌管理
- 由于后端接口有登录检查,令牌管理,提供了一种可以通过调用接口的方式对系统进行各种操作。
- 调用示例:
-
+
```令牌调用示例
/**
* test token
@@ -477,15 +493,15 @@ conf/common/hadoop.properties
### 依赖(DEPENDENT)节点
- 依赖节点,就是**依赖检查节点**。比如A流程依赖昨天的B流程执行成功,依赖节点会去检查B流程在昨天是否有执行成功的实例。
-
+
> 拖动工具栏中的![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_DEPENDENT.png)任务节点到画板中,双击任务节点,如下图:
-
+
> 依赖节点提供了逻辑判断功能,比如检查昨天的B流程是否成功,或者C流程是否执行成功。
-
+
@@ -536,7 +552,7 @@ conf/common/hadoop.properties
### SPARK节点
- 通过SPARK节点,可以直接直接执行SPARK程序,对于spark节点,worker会使用`spark-submit`方式提交任务
-
+
> 拖动工具栏中的![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_SPARK.png)任务节点到画板中,双击任务节点,如下图:
@@ -563,7 +579,7 @@ conf/common/hadoop.properties
> 拖动工具栏中的![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_MR.png)任务节点到画板中,双击任务节点,如下图:
1. JAVA程序
-
+
@@ -592,7 +608,7 @@ conf/common/hadoop.properties
### Python节点
- 使用python节点,可以直接执行python脚本,对于python节点,worker会使用`python **`方式提交任务。
-
+
> 拖动工具栏中的![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_PYTHON.png)任务节点到画板中,双击任务节点,如下图:
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java b/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
index 4867f3ca986e8d76ce602ffcdf99e8c6d02b93d1..f0096f9648d0d5bd55439fe5506228e33beaccb8 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
@@ -212,6 +212,7 @@ public enum Status {
DELETE_SCHEDULE_CRON_BY_ID_ERROR(50024,"delete schedule by id error"),
BATCH_DELETE_PROCESS_DEFINE_ERROR(50025,"batch delete process definition error"),
BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR(50026,"batch delete process definition by ids {0} error"),
+ TENANT_NOT_SUITABLE(50027,"there is not any tenant suitable, please choose a tenant available."),
HDFS_NOT_STARTUP(60001,"hdfs not startup"),
HDFS_TERANT_RESOURCES_FILE_EXISTS(60002,"resource file exists,please delete resource first"),
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java
index 9602ac6cefac877f78bf51fa7352b0ceec5da65e..a2a480f43c2395582dfa15222a92748683642e29 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java
@@ -110,6 +110,13 @@ public class ExecutorService extends BaseService{
return result;
}
+ if (!checkTenantSuitable(processDefinition)){
+ logger.error("there is not any vaild tenant for the process definition: id:{},name:{}, ",
+ processDefinition.getId(), processDefinition.getName());
+ putMsg(result, Status.TENANT_NOT_SUITABLE);
+ return result;
+ }
+
/**
* create command
*/
@@ -190,15 +197,10 @@ public class ExecutorService extends BaseService{
if (status != Status.SUCCESS) {
return checkResult;
}
-
- // checkTenantExists();
- Tenant tenant = processDao.getTenantForProcess(processDefinition.getTenantId(),
- processDefinition.getUserId());
- if(tenant == null){
+ if (!checkTenantSuitable(processDefinition)){
logger.error("there is not any vaild tenant for the process definition: id:{},name:{}, ",
processDefinition.getId(), processDefinition.getName());
- putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
- return result;
+ putMsg(result, Status.TENANT_NOT_SUITABLE);
}
switch (executeType) {
@@ -240,6 +242,21 @@ public class ExecutorService extends BaseService{
return result;
}
+ /**
+ * check tenant suitable
+ * @param processDefinition
+ * @return
+ */
+ private boolean checkTenantSuitable(ProcessDefinition processDefinition) {
+ // checkTenantExists();
+ Tenant tenant = processDao.getTenantForProcess(processDefinition.getTenantId(),
+ processDefinition.getUserId());
+ if(tenant == null){
+ return false;
+ }
+ return true;
+ }
+
/**
* Check the state of process instance and the type of operation match
*
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
index a797ce528606c96b5d6ea1a3bd056149801ab988..7b4b1ee063ce5a36530209f16e2d2676f7fdc89a 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
@@ -490,7 +490,7 @@ public class ProcessDefinitionService extends BaseDAGService {
// set status
schedule.setReleaseState(ReleaseState.OFFLINE);
scheduleMapper.update(schedule);
- deleteSchedule(project.getId(), id);
+ deleteSchedule(project.getId(), schedule.getId());
}
break;
}
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java
index 2766a101e10ff5097b1a35a1c186e3cdcb88a74d..d4515c79f326e646d886950754a7df707cffea84 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java
@@ -456,14 +456,14 @@ public class SchedulerService extends BaseService {
/**
* delete schedule
*/
- public static void deleteSchedule(int projectId, int processId) throws RuntimeException{
- logger.info("delete schedules of project id:{}, flow id:{}", projectId, processId);
+ public static void deleteSchedule(int projectId, int scheduleId) throws RuntimeException{
+ logger.info("delete schedules of project id:{}, schedule id:{}", projectId, scheduleId);
- String jobName = QuartzExecutors.buildJobName(processId);
+ String jobName = QuartzExecutors.buildJobName(scheduleId);
String jobGroupName = QuartzExecutors.buildJobGroupName(projectId);
if(!QuartzExecutors.getInstance().deleteJob(jobName, jobGroupName)){
- logger.warn("set offline failure:projectId:{},processId:{}",projectId,processId);
+ logger.warn("set offline failure:projectId:{},scheduleId:{}",projectId,scheduleId);
throw new RuntimeException(String.format("set offline failure"));
}
diff --git a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java b/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java
index 73f7499fa796e1a19dae216705d7ed262f6c0ee2..de37b5ffce48b569732d5ad9d59785c5aab26609 100644
--- a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java
+++ b/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java
@@ -228,11 +228,11 @@ public class TaskQueueZkImpl extends AbstractZKClient implements ITaskQueue {
int j = 0;
List taskslist = new ArrayList<>(tasksNum);
while(iterator.hasNext()){
- if(j++ < tasksNum){
- String task = iterator.next();
-
- taskslist.add(getOriginTaskFormat(task));
+ if(j++ >= tasksNum){
+ break;
}
+ String task = iterator.next();
+ taskslist.add(getOriginTaskFormat(task));
}
return taskslist;
}
@@ -245,6 +245,9 @@ public class TaskQueueZkImpl extends AbstractZKClient implements ITaskQueue {
*/
private String getOriginTaskFormat(String formatTask){
String[] taskArray = formatTask.split(Constants.UNDERLINE);
+ if(taskArray.length< 4){
+ return formatTask;
+ }
int processInstanceId = Integer.parseInt(taskArray[1]);
int taskId = Integer.parseInt(taskArray[3]);
diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java b/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java
index bbb404f536cd71900f68d372cf98764894e32d78..1e0bd196ff25dbfe4196b5a54ce777e0081f4480 100644
--- a/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java
+++ b/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java
@@ -16,6 +16,7 @@
*/
package cn.escheduler.server.utils;
+import cn.escheduler.common.Constants;
import org.slf4j.Logger;
import java.util.ArrayList;
@@ -31,7 +32,7 @@ public class LoggerUtils {
/**
* rules for extracting application ID
*/
- private static final Pattern APPLICATION_REGEX = Pattern.compile("\\d+_\\d+");
+ private static final Pattern APPLICATION_REGEX = Pattern.compile(Constants.APPLICATION_REGEX);
/**
* build job id
diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java b/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
index 2d88fdb84378ab59dee2c6f9bccc353f38c8cdba..de4666d102e2e2b32a0beabb17a3ca831ffdbcfc 100644
--- a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
+++ b/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
@@ -210,6 +210,11 @@ public class FetchTaskThread implements Runnable{
Tenant tenant = processDao.getTenantForProcess(processInstance.getTenantId(),
processDefine.getUserId());
+ if(tenant == null){
+ logger.error("cannot find suitable tenant for the task:{}, process instance tenant:{}, process definition tenant:{}",
+ taskInstance.getName(),processInstance.getTenantId(), processDefine.getTenantId());
+ continue;
+ }
// check and create Linux users
FileUtils.createWorkDirAndUserIfAbsent(execLocalPath,
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index b2062b7769330e3073fce89e789532aa3a7b39f0..e1226585f747ab0c1bbb525970f9a1c5e27a2daf 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -459,8 +459,6 @@
'tasks': {
deep: true,
handler (o) {
- console.log('+++++ save dag params +++++')
- console.log(o)
// Edit state does not allow deletion of node a...
this.setIsEditDag(true)