mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-03 04:39:00 +08:00
Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
This commit is contained in:
commit
5ab9c8d5f1
1
.github/ISSUE_TEMPLATE/bug_report.md
vendored
1
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -2,7 +2,6 @@
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: "[Bug][Module Name] Bug title "
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
1
.github/ISSUE_TEMPLATE/feature_request.md
vendored
1
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -2,7 +2,6 @@
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: "[Feature][Module Name] Feature title"
|
||||
labels: new feature
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
@ -2,7 +2,6 @@
|
||||
name: Improvement suggestion
|
||||
about: Improvement suggestion for this project
|
||||
title: "[Improvement][Module Name] Improvement title"
|
||||
labels: improvement
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
1
.github/ISSUE_TEMPLATE/question.md
vendored
1
.github/ISSUE_TEMPLATE/question.md
vendored
@ -2,7 +2,6 @@
|
||||
name: Question
|
||||
about: Have a question wanted to be help
|
||||
title: "[Question] Question title"
|
||||
labels: question
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
54
README.md
54
README.md
@ -7,46 +7,44 @@ Dolphin Scheduler Official Website
|
||||
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache-dolphinscheduler&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler)
|
||||
|
||||
|
||||
> Dolphin Scheduler for Big Data
|
||||
|
||||
[![Stargazers over time](https://starchart.cc/apache/incubator-dolphinscheduler.svg)](https://starchart.cc/apache/incubator-dolphinscheduler)
|
||||
|
||||
[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](README.md)
|
||||
[![CN doc](https://img.shields.io/badge/文档-中文版-blue.svg)](README_zh_CN.md)
|
||||
|
||||
|
||||
### Design features:
|
||||
### Design Features:
|
||||
|
||||
Dolphin Scheduler is a distributed and easy-to-extend visual DAG workflow scheduling system. It dedicates to solving the complex dependencies in data processing to make the scheduling system `out of the box` for the data processing process.
|
||||
DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing various types of jobs available `out of the box`.
|
||||
|
||||
Its main objectives are as follows:
|
||||
|
||||
- Associate the tasks according to the dependencies of the tasks in a DAG graph, which can visualize the running state of the task in real-time.
|
||||
- Support many task types: Shell, MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Sub_Process, Procedure, etc.
|
||||
- Support process scheduling, dependency scheduling, manual scheduling, manual pause/stop/recovery, support for failed retry/alarm, recovery from specified nodes, Kill task, etc.
|
||||
- Support the priority of process & task, task failover, and task timeout alarm or failure.
|
||||
- Support process global parameters and node custom parameter settings.
|
||||
- Support online upload/download of resource files, management, etc. Support online file creation and editing.
|
||||
- Support task log online viewing and scrolling, online download log, etc.
|
||||
- Implement cluster HA, decentralize Master cluster and Worker cluster through Zookeeper.
|
||||
- Support various task types: Shell, MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Sub_Process, Procedure, etc.
|
||||
- Support scheduling of workflows and dependencies, manual scheduling to pause/stop/recover task, support failure task retry/alarm, recover specified nodes from failure, kill task, etc.
|
||||
- Support the priority of workflows & tasks, task failover, and task timeout alarm or failure.
|
||||
- Support workflow global parameters and node customized parameter settings.
|
||||
- Support online upload/download/management of resource files, etc. Support online file creation and editing.
|
||||
- Support task log online viewing and scrolling and downloading, etc.
|
||||
- Have implemented cluster HA, decentralize Master cluster and Worker cluster through Zookeeper.
|
||||
- Support the viewing of Master/Worker CPU load, memory, and CPU usage metrics.
|
||||
- Support presenting tree or Gantt chart of workflow history as well as the statistics results of task & process status in each workflow.
|
||||
- Support backfilling data.
|
||||
- Support displaying workflow history in tree/Gantt chart, as well as statistical analysis on the task status & process status in each workflow.
|
||||
- Support back-filling data.
|
||||
- Support multi-tenant.
|
||||
- Support internationalization.
|
||||
- There are more waiting for partners to explore...
|
||||
- More features waiting for partners to explore...
|
||||
|
||||
|
||||
### What's in Dolphin Scheduler
|
||||
### What's in DolphinScheduler
|
||||
|
||||
Stability | Easy to use | Features | Scalability |
|
||||
-- | -- | -- | --
|
||||
Decentralized multi-master and multi-worker | Visualization process defines key information such as task status, task type, retry times, task running machine, visual variables, and so on at a glance. | Support pause, recover operation | Support custom task types
|
||||
HA is supported by itself | All process definition operations are visualized, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, the API mode operation is provided. | Users on Dolphin Scheduler can achieve many-to-one or one-to-one mapping relationship through tenants and Hadoop users, which is very important for scheduling large data jobs. | The scheduler uses distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic online and offline.
|
||||
Overload processing: Overload processing: By using the task queue mechanism, the number of schedulable tasks on a single machine can be flexibly configured. Machine jam can be avoided with high tolerance to numbers of tasks cached in task queue. | One-click deployment | Support traditional shell tasks, and big data platform task scheduling: MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Procedure, Sub_Process | |
|
||||
Decentralized multi-master and multi-worker | Visualization of workflow key information, such as task status, task type, retry times, task operation machine information, visual variables, and so on at a glance. | Support pause, recover operation | Support customized task types
|
||||
support HA | Visualization of all workflow operations, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, provide API mode operations. | Users on DolphinScheduler can achieve many-to-one or one-to-one mapping relationship through tenants and Hadoop users, which is very important for scheduling large data jobs. | The scheduler supports distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic adjustment.
|
||||
Overload processing: By using the task queue mechanism, the number of schedulable tasks on a single machine can be flexibly configured. Machine jam can be avoided with high tolerance to numbers of tasks cached in task queue. | One-click deployment | Support traditional shell tasks, and big data platform task scheduling: MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Procedure, Sub_Process | |
|
||||
|
||||
|
||||
### System partial screenshot
|
||||
### User Interface Screenshots
|
||||
|
||||
![home page](https://user-images.githubusercontent.com/15833811/75218288-bf286400-57d4-11ea-8263-d639c6511d5f.jpg)
|
||||
![dag](https://user-images.githubusercontent.com/15833811/75236750-3374fe80-57f9-11ea-857d-62a66a5a559d.png)
|
||||
@ -57,13 +55,9 @@ Overload processing: Overload processing: By using the task queue mechanism, the
|
||||
![security](https://user-images.githubusercontent.com/15833811/75236441-bfd2f180-57f8-11ea-88bd-f24311e01b7e.png)
|
||||
![treeview](https://user-images.githubusercontent.com/15833811/75217191-3fe56100-57d1-11ea-8856-f19180d9a879.png)
|
||||
|
||||
### QuickStart in Docker
|
||||
Please referer the official website document:[[QuickStart in Docker](https://dolphinscheduler.apache.org/en-us/docs/1.3.4/user_doc/docker-deployment.html)]
|
||||
|
||||
### Recent R&D plan
|
||||
The work plan of Dolphin Scheduler: [R&D plan](https://github.com/apache/incubator-dolphinscheduler/projects/1), which `In Develop` card shows the features that are currently being developed and TODO card lists what needs to be done(including feature ideas).
|
||||
|
||||
### How to contribute
|
||||
|
||||
Welcome to participate in contributing, please refer to this website to find out more: [[How to contribute](https://dolphinscheduler.apache.org/en-us/docs/development/contribute.html)]
|
||||
|
||||
### How to Build
|
||||
|
||||
@ -80,14 +74,16 @@ dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release
|
||||
|
||||
### Thanks
|
||||
|
||||
Dolphin Scheduler is based on a lot of excellent open-source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open-source projects of Apache and so on.
|
||||
We would like to express our deep gratitude to all the open-source projects which contribute to making the dream of Dolphin Scheduler comes true. We hope that we are not only the beneficiaries of open-source, but also give back to the community. Besides, we expect the partners who have the same passion and conviction to open-source will join in and contribute to the open-source community!
|
||||
|
||||
DolphinScheduler is based on a lot of excellent open-source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open-source projects of Apache and so on.
|
||||
We would like to express our deep gratitude to all the open-source projects used in Dolphin Scheduler. We hope that we are not only the beneficiaries of open-source, but also give back to the community. Besides, we hope everyone who have the same enthusiasm and passion for open source could join in and contribute to the open-source community!
|
||||
|
||||
### Get Help
|
||||
1. Submit an issue
|
||||
1. Submit an [[issue](https://github.com/apache/incubator-dolphinscheduler/issues/new/choose)]
|
||||
1. Subscribe to the mail list: https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html, then email dev@dolphinscheduler.apache.org
|
||||
|
||||
### How to Contribute
|
||||
The community welcomes everyone to participate in contributing, please refer to this website to find out more: [[How to contribute](https://dolphinscheduler.apache.org/en-us/community/development/contribute.html)]
|
||||
|
||||
|
||||
### License
|
||||
Please refer to the [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) file.
|
||||
|
@ -15,53 +15,64 @@
|
||||
~ limitations under the License.
|
||||
-->
|
||||
<configuration>
|
||||
<property>
|
||||
<name>worker.exec.threads</name>
|
||||
<value>100</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker execute thread num</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.heartbeat.interval</name>
|
||||
<value>10</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker heartbeat interval</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.max.cpuload.avg</name>
|
||||
<value>100</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.reserved.memory</name>
|
||||
<value>0.3</value>
|
||||
<description>only larger than reserved memory, worker server can work. default value : physical memory * 1/10, unit is G.</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
|
||||
<property>
|
||||
<name>worker.listen.port</name>
|
||||
<value>1234</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker listen port</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.groups</name>
|
||||
<value>default</value>
|
||||
<description>default worker group</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.exec.threads</name>
|
||||
<value>100</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker execute thread num</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.heartbeat.interval</name>
|
||||
<value>10</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker heartbeat interval</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.max.cpuload.avg</name>
|
||||
<value>100</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2
|
||||
</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.reserved.memory</name>
|
||||
<value>0.3</value>
|
||||
<description>only larger than reserved memory, worker server can work. default value : physical memory * 1/10,
|
||||
unit is G.
|
||||
</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.listen.port</name>
|
||||
<value>1234</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker listen port</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.groups</name>
|
||||
<value>default</value>
|
||||
<description>default worker group</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
<property>
|
||||
<name>worker.weigth</name>
|
||||
<value>100</value>
|
||||
<value-attributes>
|
||||
<type>int</type>
|
||||
</value-attributes>
|
||||
<description>worker weight</description>
|
||||
<on-ambari-upgrade add="true"/>
|
||||
</property>
|
||||
</configuration>
|
@ -22,36 +22,24 @@ package org.apache.dolphinscheduler.plugin.alert.dingtalk;
|
||||
*/
|
||||
public class DingTalkParamsConstants {
|
||||
|
||||
|
||||
static final String DING_TALK_PROXY_ENABLE = "isEnableProxy";
|
||||
static final String DING_TALK_WEB_HOOK = "webhook";
|
||||
static final String NAME_DING_TALK_WEB_HOOK = "WebHook";
|
||||
static final String DING_TALK_KEYWORD = "keyword";
|
||||
static final String NAME_DING_TALK_KEYWORD = "Keyword";
|
||||
static final String NAME_DING_TALK_PROXY_ENABLE = "IsEnableProxy";
|
||||
static final String DING_TALK_PROXY = "proxy";
|
||||
static final String NAME_DING_TALK_PROXY = "Proxy";
|
||||
static final String DING_TALK_PORT = "port";
|
||||
static final String NAME_DING_TALK_PORT = "Port";
|
||||
static final String DING_TALK_USER = "user";
|
||||
static final String NAME_DING_TALK_USER = "User";
|
||||
static final String DING_TALK_PASSWORD = "password";
|
||||
static final String NAME_DING_TALK_PASSWORD = "Password";
|
||||
|
||||
private DingTalkParamsConstants() {
|
||||
throw new IllegalStateException("Utility class");
|
||||
}
|
||||
|
||||
static final String DING_TALK_WEB_HOOK = "dingtalk.webhook";
|
||||
|
||||
static final String NAME_DING_TALK_WEB_HOOK = "dingTalkWebHook";
|
||||
|
||||
static final String DING_TALK_KEYWORD = "dingtalk.keyword";
|
||||
|
||||
static final String NAME_DING_TALK_KEYWORD = "dingTalkKeyword";
|
||||
|
||||
public static final String DING_TALK_PROXY_ENABLE = "dingtalk.isEnableProxy";
|
||||
|
||||
static final String NAME_DING_TALK_PROXY_ENABLE = "dingTalkIsEnableProxy";
|
||||
|
||||
static final String DING_TALK_PROXY = "dingtalk.proxy";
|
||||
|
||||
static final String NAME_DING_TALK_PROXY = "dingTalkProxy";
|
||||
|
||||
static final String DING_TALK_PORT = "dingtalk.port";
|
||||
|
||||
static final String NAME_DING_TALK_PORT = "dingTalkPort";
|
||||
|
||||
static final String DING_TALK_USER = "dingtalk.user";
|
||||
|
||||
static final String NAME_DING_TALK_USER = "dingTalkUser";
|
||||
|
||||
static final String DING_TALK_PASSWORD = "dingtalk.password";
|
||||
|
||||
static final String NAME_DING_TALK_PASSWORD = "dingTalkPassword";
|
||||
|
||||
}
|
||||
|
@ -75,51 +75,6 @@ public class DingTalkSender {
|
||||
|
||||
}
|
||||
|
||||
public AlertResult sendDingTalkMsg(String msg, String charset) {
|
||||
AlertResult alertResult;
|
||||
try {
|
||||
String resp = sendMsg(msg, charset);
|
||||
return checkSendDingTalkSendMsgResult(resp);
|
||||
} catch (Exception e) {
|
||||
logger.info("send ding talk alert msg exception : {}", e.getMessage());
|
||||
alertResult = new AlertResult();
|
||||
alertResult.setStatus("false");
|
||||
alertResult.setMessage("send ding talk alert fail.");
|
||||
}
|
||||
return alertResult;
|
||||
}
|
||||
|
||||
private String sendMsg(String msg, String charset) throws IOException {
|
||||
|
||||
String msgToJson = textToJsonString(msg + "#" + keyword);
|
||||
HttpPost httpPost = constructHttpPost(url, msgToJson, charset);
|
||||
|
||||
CloseableHttpClient httpClient;
|
||||
if (Boolean.TRUE.equals(enableProxy)) {
|
||||
httpClient = getProxyClient(proxy, port, user, password);
|
||||
RequestConfig rcf = getProxyConfig(proxy, port);
|
||||
httpPost.setConfig(rcf);
|
||||
} else {
|
||||
httpClient = getDefaultClient();
|
||||
}
|
||||
|
||||
try {
|
||||
CloseableHttpResponse response = httpClient.execute(httpPost);
|
||||
String resp;
|
||||
try {
|
||||
HttpEntity entity = response.getEntity();
|
||||
resp = EntityUtils.toString(entity, charset);
|
||||
EntityUtils.consume(entity);
|
||||
} finally {
|
||||
response.close();
|
||||
}
|
||||
logger.info("Ding Talk send {}, resp: {}", msg, resp);
|
||||
return resp;
|
||||
} finally {
|
||||
httpClient.close();
|
||||
}
|
||||
}
|
||||
|
||||
private static HttpPost constructHttpPost(String url, String msg, String charset) {
|
||||
HttpPost post = new HttpPost(url);
|
||||
StringEntity entity = new StringEntity(msg, charset);
|
||||
@ -155,27 +110,6 @@ public class DingTalkSender {
|
||||
return JSONUtils.toJsonString(items);
|
||||
}
|
||||
|
||||
public static class DingTalkSendMsgResponse {
|
||||
private Integer errcode;
|
||||
private String errmsg;
|
||||
|
||||
public Integer getErrcode() {
|
||||
return errcode;
|
||||
}
|
||||
|
||||
public void setErrcode(Integer errcode) {
|
||||
this.errcode = errcode;
|
||||
}
|
||||
|
||||
public String getErrmsg() {
|
||||
return errmsg;
|
||||
}
|
||||
|
||||
public void setErrmsg(String errmsg) {
|
||||
this.errmsg = errmsg;
|
||||
}
|
||||
}
|
||||
|
||||
private static AlertResult checkSendDingTalkSendMsgResult(String result) {
|
||||
AlertResult alertResult = new AlertResult();
|
||||
alertResult.setStatus("false");
|
||||
@ -201,4 +135,70 @@ public class DingTalkSender {
|
||||
return alertResult;
|
||||
}
|
||||
|
||||
public AlertResult sendDingTalkMsg(String title, String content) {
|
||||
AlertResult alertResult;
|
||||
try {
|
||||
String resp = sendMsg(title, content);
|
||||
return checkSendDingTalkSendMsgResult(resp);
|
||||
} catch (Exception e) {
|
||||
logger.info("send ding talk alert msg exception : {}", e.getMessage());
|
||||
alertResult = new AlertResult();
|
||||
alertResult.setStatus("false");
|
||||
alertResult.setMessage("send ding talk alert fail.");
|
||||
}
|
||||
return alertResult;
|
||||
}
|
||||
|
||||
private String sendMsg(String title, String content) throws IOException {
|
||||
|
||||
String msgToJson = textToJsonString(title + content + "#" + keyword);
|
||||
HttpPost httpPost = constructHttpPost(url, msgToJson, "UTF-8");
|
||||
|
||||
CloseableHttpClient httpClient;
|
||||
if (Boolean.TRUE.equals(enableProxy)) {
|
||||
httpClient = getProxyClient(proxy, port, user, password);
|
||||
RequestConfig rcf = getProxyConfig(proxy, port);
|
||||
httpPost.setConfig(rcf);
|
||||
} else {
|
||||
httpClient = getDefaultClient();
|
||||
}
|
||||
|
||||
try {
|
||||
CloseableHttpResponse response = httpClient.execute(httpPost);
|
||||
String resp;
|
||||
try {
|
||||
HttpEntity entity = response.getEntity();
|
||||
resp = EntityUtils.toString(entity, "UTF-8");
|
||||
EntityUtils.consume(entity);
|
||||
} finally {
|
||||
response.close();
|
||||
}
|
||||
logger.info("Ding Talk send title :{},content : {}, resp: {}", title, content, resp);
|
||||
return resp;
|
||||
} finally {
|
||||
httpClient.close();
|
||||
}
|
||||
}
|
||||
|
||||
public static class DingTalkSendMsgResponse {
|
||||
private Integer errcode;
|
||||
private String errmsg;
|
||||
|
||||
public Integer getErrcode() {
|
||||
return errcode;
|
||||
}
|
||||
|
||||
public void setErrcode(Integer errcode) {
|
||||
this.errcode = errcode;
|
||||
}
|
||||
|
||||
public String getErrmsg() {
|
||||
return errmsg;
|
||||
}
|
||||
|
||||
public void setErrmsg(String errmsg) {
|
||||
this.errmsg = errmsg;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ public class DingTalkSenderTest {
|
||||
dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
|
||||
dingTalkConfig.put(DingTalkParamsConstants.NAME_DING_TALK_PROXY_ENABLE, "true");
|
||||
dingTalkSender = new DingTalkSender(dingTalkConfig);
|
||||
AlertResult alertResult = dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
|
||||
AlertResult alertResult = dingTalkSender.sendDingTalkMsg("title", "content test");
|
||||
Assert.assertEquals("false",alertResult.getStatus());
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,82 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ 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.
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>dolphinscheduler-alert-plugin</artifactId>
|
||||
<groupId>org.apache.dolphinscheduler</groupId>
|
||||
<version>1.3.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.dolphinscheduler</groupId>
|
||||
<artifactId>dolphinscheduler-alert-feishu</artifactId>
|
||||
<packaging>dolphinscheduler-plugin</packaging>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.dolphinscheduler</groupId>
|
||||
<artifactId>dolphinscheduler-spi</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<type>jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>dolphinscheduler-alert-feishu-${project.version}</finalName>
|
||||
</build>
|
||||
|
||||
</project>
|
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertChannel;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertData;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertInfo;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertResult;
|
||||
import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class FeiShuAlertChannel implements AlertChannel {
|
||||
@Override
|
||||
public AlertResult process(AlertInfo alertInfo) {
|
||||
|
||||
AlertData alertData = alertInfo.getAlertData();
|
||||
String alertParams = alertInfo.getAlertParams();
|
||||
Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
|
||||
return new FeiShuSender(paramsMap).sendFeiShuMsg(alertData);
|
||||
}
|
||||
}
|
@ -0,0 +1,82 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertChannel;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
|
||||
import org.apache.dolphinscheduler.spi.params.InputParam;
|
||||
import org.apache.dolphinscheduler.spi.params.PasswordParam;
|
||||
import org.apache.dolphinscheduler.spi.params.RadioParam;
|
||||
import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
|
||||
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
|
||||
import org.apache.dolphinscheduler.spi.params.base.Validate;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class FeiShuAlertChannelFactory implements AlertChannelFactory {
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Feishu";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PluginParams> getParams() {
|
||||
InputParam webHookParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_WEB_HOOK, FeiShuParamsConstants.WEB_HOOK)
|
||||
.addValidate(Validate.newBuilder()
|
||||
.setRequired(true)
|
||||
.build())
|
||||
.build();
|
||||
RadioParam isEnableProxy =
|
||||
RadioParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE, FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE)
|
||||
.addParamsOptions(new ParamsOptions("YES", true, false))
|
||||
.addParamsOptions(new ParamsOptions("NO", false, false))
|
||||
.setValue(true)
|
||||
.addValidate(Validate.newBuilder()
|
||||
.setRequired(false)
|
||||
.build())
|
||||
.build();
|
||||
InputParam proxyParam =
|
||||
InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY, FeiShuParamsConstants.FEI_SHU_PROXY)
|
||||
.addValidate(Validate.newBuilder()
|
||||
.setRequired(false).build())
|
||||
.build();
|
||||
|
||||
InputParam portParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PORT, FeiShuParamsConstants.FEI_SHU_PORT)
|
||||
.addValidate(Validate.newBuilder()
|
||||
.setRequired(false).build())
|
||||
.build();
|
||||
|
||||
InputParam userParam =
|
||||
InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_USER, FeiShuParamsConstants.FEI_SHU_USER)
|
||||
.addValidate(Validate.newBuilder()
|
||||
.setRequired(false).build())
|
||||
.build();
|
||||
PasswordParam passwordParam = PasswordParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD, FeiShuParamsConstants.FEI_SHU_PASSWORD)
|
||||
.setPlaceholder("if enable use authentication, you need input password")
|
||||
.build();
|
||||
|
||||
return Arrays.asList(webHookParam, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public AlertChannel create() {
|
||||
return new FeiShuAlertChannel();
|
||||
}
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
public class FeiShuAlertPlugin implements DolphinSchedulerPlugin {
|
||||
@Override
|
||||
public Iterable<AlertChannelFactory> getAlertChannelFactorys() {
|
||||
return ImmutableList.of(new FeiShuAlertChannelFactory());
|
||||
}
|
||||
}
|
@ -0,0 +1,49 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
public class FeiShuParamsConstants {
|
||||
|
||||
private FeiShuParamsConstants() {
|
||||
throw new IllegalStateException("Utility class");
|
||||
}
|
||||
|
||||
static final String WEB_HOOK = "webhook";
|
||||
|
||||
static final String NAME_WEB_HOOK = "webHook";
|
||||
|
||||
public static final String FEI_SHU_PROXY_ENABLE = "isEnableProxy";
|
||||
|
||||
static final String NAME_FEI_SHU_PROXY_ENABLE = "isEnableProxy";
|
||||
|
||||
static final String FEI_SHU_PROXY = "proxy";
|
||||
|
||||
static final String NAME_FEI_SHU_PROXY = "proxy";
|
||||
|
||||
static final String FEI_SHU_PORT = "port";
|
||||
|
||||
static final String NAME_FEI_SHU_PORT = "port";
|
||||
|
||||
static final String FEI_SHU_USER = "user";
|
||||
|
||||
static final String NAME_FEI_SHU_USER = "user";
|
||||
|
||||
static final String FEI_SHU_PASSWORD = "password";
|
||||
|
||||
static final String NAME_FEI_SHU_PASSWORD = "password";
|
||||
}
|
@ -0,0 +1,223 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertData;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertResult;
|
||||
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
|
||||
|
||||
import org.apache.commons.codec.binary.StringUtils;
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.HttpHost;
|
||||
import org.apache.http.HttpStatus;
|
||||
import org.apache.http.client.config.RequestConfig;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
import org.apache.http.client.methods.HttpPost;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
public class FeiShuSender {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FeiShuSender.class);
|
||||
|
||||
private String url;
|
||||
|
||||
private Boolean enableProxy;
|
||||
|
||||
private String proxy;
|
||||
|
||||
private Integer port;
|
||||
|
||||
private String user;
|
||||
|
||||
private String password;
|
||||
|
||||
FeiShuSender(Map<String, String> config) {
|
||||
url = config.get(FeiShuParamsConstants.NAME_WEB_HOOK);
|
||||
enableProxy = Boolean.valueOf(config.get(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE));
|
||||
if (Boolean.TRUE.equals(enableProxy)) {
|
||||
port = Integer.parseInt(config.get(FeiShuParamsConstants.NAME_FEI_SHU_PORT));
|
||||
proxy = config.get(FeiShuParamsConstants.NAME_FEI_SHU_PROXY);
|
||||
user = config.get(FeiShuParamsConstants.NAME_FEI_SHU_USER);
|
||||
password = config.get(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static RequestConfig getProxyConfig(String proxy, int port) {
|
||||
HttpHost httpProxy = new HttpHost(proxy, port);
|
||||
return RequestConfig.custom().setProxy(httpProxy).build();
|
||||
}
|
||||
|
||||
private static String textToJsonString(AlertData alertData) {
|
||||
|
||||
Map<String, Object> items = new HashMap<>(2);
|
||||
items.put("msg_type", "text");
|
||||
Map<String, String> textContent = new HashMap<>();
|
||||
byte[] byt = StringUtils.getBytesUtf8(formatContent(alertData));
|
||||
String txt = StringUtils.newStringUtf8(byt);
|
||||
textContent.put("text", txt);
|
||||
items.put("content", textContent);
|
||||
return JSONUtils.toJsonString(items);
|
||||
}
|
||||
|
||||
private static AlertResult checkSendFeiShuSendMsgResult(String result) {
|
||||
AlertResult alertResult = new AlertResult();
|
||||
alertResult.setStatus("false");
|
||||
|
||||
if (org.apache.dolphinscheduler.spi.utils.StringUtils.isBlank(result)) {
|
||||
alertResult.setMessage("send fei shu msg error");
|
||||
logger.info("send fei shu msg error,fei shu server resp is null");
|
||||
return alertResult;
|
||||
}
|
||||
FeiShuSendMsgResponse sendMsgResponse = JSONUtils.parseObject(result, FeiShuSendMsgResponse.class);
|
||||
|
||||
if (null == sendMsgResponse) {
|
||||
alertResult.setMessage("send fei shu msg fail");
|
||||
logger.info("send fei shu msg error,resp error");
|
||||
return alertResult;
|
||||
}
|
||||
if (sendMsgResponse.statusCode == 0) {
|
||||
alertResult.setStatus("true");
|
||||
alertResult.setMessage("send fei shu msg success");
|
||||
return alertResult;
|
||||
}
|
||||
alertResult.setMessage(String.format("alert send fei shu msg error : %s", sendMsgResponse.getStatusMessage()));
|
||||
logger.info("alert send fei shu msg error : {} ,Extra : {} ", sendMsgResponse.getStatusMessage(), sendMsgResponse.getExtra());
|
||||
return alertResult;
|
||||
}
|
||||
|
||||
public static String formatContent(AlertData alertData) {
|
||||
if (alertData.getContent() != null) {
|
||||
List<Map> list;
|
||||
try {
|
||||
list = JSONUtils.toList(alertData.getContent(), Map.class);
|
||||
} catch (Exception e) {
|
||||
logger.error("json format exception", e);
|
||||
return null;
|
||||
}
|
||||
|
||||
StringBuilder contents = new StringBuilder(100);
|
||||
contents.append(String.format("`%s`%n", alertData.getTitle()));
|
||||
for (Map map : list) {
|
||||
Iterator<Entry<String, Object>> entries = map.entrySet().iterator();
|
||||
while (entries.hasNext()) {
|
||||
Entry<String, Object> entry = entries.next();
|
||||
String key = entry.getKey();
|
||||
String value = entry.getValue().toString();
|
||||
contents.append(key + ":" + value);
|
||||
contents.append("\n");
|
||||
}
|
||||
}
|
||||
return contents.toString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public AlertResult sendFeiShuMsg(AlertData alertData) {
|
||||
AlertResult alertResult;
|
||||
try {
|
||||
String resp = sendMsg(alertData);
|
||||
return checkSendFeiShuSendMsgResult(resp);
|
||||
} catch (Exception e) {
|
||||
logger.info("send fei shu alert msg exception : {}", e.getMessage());
|
||||
alertResult = new AlertResult();
|
||||
alertResult.setStatus("false");
|
||||
alertResult.setMessage("send fei shu alert fail.");
|
||||
}
|
||||
return alertResult;
|
||||
}
|
||||
|
||||
private String sendMsg(AlertData alertData) throws IOException {
|
||||
|
||||
String msgToJson = textToJsonString(alertData);
|
||||
|
||||
HttpPost httpPost = HttpRequestUtil.constructHttpPost(url, msgToJson);
|
||||
|
||||
CloseableHttpClient httpClient;
|
||||
|
||||
httpClient = HttpRequestUtil.getHttpClient(enableProxy, proxy, port, user, password);
|
||||
|
||||
try {
|
||||
CloseableHttpResponse response = httpClient.execute(httpPost);
|
||||
|
||||
int statusCode = response.getStatusLine().getStatusCode();
|
||||
if (statusCode != HttpStatus.SC_OK) {
|
||||
logger.error("send feishu message error, return http status code: " + statusCode);
|
||||
}
|
||||
String resp;
|
||||
try {
|
||||
HttpEntity entity = response.getEntity();
|
||||
resp = EntityUtils.toString(entity, "utf-8");
|
||||
EntityUtils.consume(entity);
|
||||
} finally {
|
||||
response.close();
|
||||
}
|
||||
logger.info("Ding Talk send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(), resp);
|
||||
return resp;
|
||||
} finally {
|
||||
httpClient.close();
|
||||
}
|
||||
}
|
||||
|
||||
public static class FeiShuSendMsgResponse {
|
||||
@JsonProperty("Extra")
|
||||
private String extra;
|
||||
@JsonProperty("StatusCode")
|
||||
private Integer statusCode;
|
||||
@JsonProperty("StatusMessage")
|
||||
private String statusMessage;
|
||||
|
||||
public String getExtra() {
|
||||
return extra;
|
||||
}
|
||||
|
||||
public void setExtra(String extra) {
|
||||
this.extra = extra;
|
||||
}
|
||||
|
||||
public Integer getStatusCode() {
|
||||
return statusCode;
|
||||
}
|
||||
|
||||
public void setStatusCode(Integer statusCode) {
|
||||
this.statusCode = statusCode;
|
||||
}
|
||||
|
||||
public String getStatusMessage() {
|
||||
return statusMessage;
|
||||
}
|
||||
|
||||
public void setStatusMessage(String statusMessage) {
|
||||
this.statusMessage = statusMessage;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,50 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
import org.apache.http.auth.AuthScope;
|
||||
import org.apache.http.auth.UsernamePasswordCredentials;
|
||||
import org.apache.http.client.CredentialsProvider;
|
||||
import org.apache.http.client.methods.HttpPost;
|
||||
import org.apache.http.entity.ContentType;
|
||||
import org.apache.http.entity.StringEntity;
|
||||
import org.apache.http.impl.client.BasicCredentialsProvider;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.impl.client.HttpClients;
|
||||
|
||||
public class HttpRequestUtil {
|
||||
|
||||
public static CloseableHttpClient getHttpClient(boolean enableProxy, String proxy, Integer port, String user, String password) {
|
||||
if (enableProxy) {
|
||||
HttpHost httpProxy = new HttpHost(proxy, port);
|
||||
CredentialsProvider provider = new BasicCredentialsProvider();
|
||||
provider.setCredentials(new AuthScope(httpProxy), new UsernamePasswordCredentials(user, password));
|
||||
return HttpClients.custom().setDefaultCredentialsProvider(provider).build();
|
||||
} else {
|
||||
return HttpClients.createDefault();
|
||||
}
|
||||
}
|
||||
|
||||
public static HttpPost constructHttpPost(String url, String msg) {
|
||||
HttpPost post = new HttpPost(url);
|
||||
StringEntity entity = new StringEntity(msg, ContentType.APPLICATION_JSON);
|
||||
post.setEntity(entity);
|
||||
return post;
|
||||
}
|
||||
}
|
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertChannel;
|
||||
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
|
||||
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class FeiShuAlertChannelFactoryTest {
|
||||
|
||||
@Test
|
||||
public void testGetParams() {
|
||||
FeiShuAlertChannelFactory feiShuAlertChannelFactory = new FeiShuAlertChannelFactory();
|
||||
List<PluginParams> params = feiShuAlertChannelFactory.getParams();
|
||||
JSONUtils.toJsonString(params);
|
||||
Assert.assertEquals(6, params.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreate() {
|
||||
FeiShuAlertChannelFactory feiShuAlertChannelFactory = new FeiShuAlertChannelFactory();
|
||||
AlertChannel alertChannel = feiShuAlertChannelFactory.create();
|
||||
Assert.assertNotNull(alertChannel);
|
||||
}
|
||||
}
|
@ -0,0 +1,75 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.plugin.alert.feishu;
|
||||
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertData;
|
||||
import org.apache.dolphinscheduler.spi.alert.AlertResult;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
public class FeiShuSenderTest {
|
||||
|
||||
|
||||
private static Map<String, String> feiShuConfig = new HashMap<>();
|
||||
|
||||
@Before
|
||||
public void initFeiShuConfig() {
|
||||
feiShuConfig.put(FeiShuParamsConstants.WEB_HOOK, "https://open.feishu.cn/open-apis/bot/v2/hook/xxxxx");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSend() {
|
||||
AlertData alertData = new AlertData();
|
||||
alertData.setTitle("feishu test title");
|
||||
alertData.setContent("feishu test content");
|
||||
FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
|
||||
AlertResult alertResult = feiShuSender.sendFeiShuMsg(alertData);
|
||||
Assert.assertEquals("false", alertResult.getStatus());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFormatContent() {
|
||||
String alertMsg = "[\n"
|
||||
+ " {\n"
|
||||
+ " \"owner\": \"dolphinscheduler\",\n"
|
||||
+ " \"processEndTime\": \"2021-01-29 19:01:11\",\n"
|
||||
+ " \"processHost\": \"10.81.129.4:5678\",\n"
|
||||
+ " \"processId\": 2926,\n"
|
||||
+ " \"processName\": \"3-20210129190038108\",\n"
|
||||
+ " \"processStartTime\": \"2021-01-29 19:00:38\",\n"
|
||||
+ " \"processState\": \"SUCCESS\",\n"
|
||||
+ " \"processType\": \"START_PROCESS\",\n"
|
||||
+ " \"projectId\": 2,\n"
|
||||
+ " \"projectName\": \"testdelproject\",\n"
|
||||
+ " \"recovery\": \"NO\",\n"
|
||||
+ " \"retryTimes\": 0,\n"
|
||||
+ " \"runTimes\": 1,\n"
|
||||
+ " \"taskId\": 0\n"
|
||||
+ " }\n"
|
||||
+ "]";
|
||||
AlertData alertData = new AlertData();
|
||||
alertData.setTitle("");
|
||||
alertData.setContent(alertMsg);
|
||||
Assert.assertNotNull(FeiShuSender.formatContent(alertData));
|
||||
}
|
||||
}
|
@ -35,6 +35,7 @@
|
||||
<module>dolphinscheduler-alert-dingtalk</module>
|
||||
<module>dolphinscheduler-alert-script</module>
|
||||
<module>dolphinscheduler-alert-http</module>
|
||||
<module>dolphinscheduler-alert-feishu</module>
|
||||
</modules>
|
||||
|
||||
|
||||
|
@ -153,19 +153,21 @@ public class WorkerGroupService extends BaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// available workerGroup list
|
||||
List<String> availableWorkerGroupList = new ArrayList<>();
|
||||
|
||||
for (String workerGroup : workerGroupList) {
|
||||
String workerGroupPath = workerPath + "/" + workerGroup;
|
||||
List<String> childrenNodes = zookeeperCachedOperator.getChildrenKeys(workerGroupPath);
|
||||
String timeStamp = "";
|
||||
for (int i = 0; i < childrenNodes.size(); i++) {
|
||||
String ip = childrenNodes.get(i);
|
||||
childrenNodes.set(i, ip.substring(0, ip.lastIndexOf(":")));
|
||||
timeStamp = ip.substring(ip.lastIndexOf(":"));
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(childrenNodes)) {
|
||||
availableWorkerGroupList.add(workerGroup);
|
||||
WorkerGroup wg = new WorkerGroup();
|
||||
wg.setName(workerGroup);
|
||||
if (isPaging) {
|
||||
wg.setIpList(childrenNodes);
|
||||
String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
|
||||
String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0) + timeStamp);
|
||||
wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));
|
||||
wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));
|
||||
}
|
||||
|
@ -61,4 +61,8 @@ public class StringUtils {
|
||||
public static String trim(String str) {
|
||||
return str == null ? null : str.trim();
|
||||
}
|
||||
|
||||
public static boolean equalsIgnoreCase(String str1, String str2) {
|
||||
return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
|
||||
}
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ yarn.application.status.address=http://ds1:8088/ws/v1/cluster/apps/%s
|
||||
# job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)
|
||||
yarn.job.history.status.address=http://ds1:19888/ws/v1/history/mapreduce/jobs/%s
|
||||
|
||||
# system env path
|
||||
# system env path, If you want to set your own path, you need to set this env file to an absolute path
|
||||
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
|
||||
development.state=false
|
||||
|
||||
|
@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2018 xaboy
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
@ -64,4 +64,9 @@
|
||||
<unpack/>
|
||||
</artifact>
|
||||
</artifactSet>
|
||||
<artifactSet to="lib/plugin/alert/feishu">
|
||||
<artifact id="${project.groupId}:dolphinscheduler-alert-feishu:zip:${project.version}">
|
||||
<unpack/>
|
||||
</artifact>
|
||||
</artifactSet>
|
||||
</runtime>
|
@ -55,7 +55,6 @@ import org.slf4j.LoggerFactory;
|
||||
import io.netty.bootstrap.Bootstrap;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelFuture;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelInitializer;
|
||||
import io.netty.channel.ChannelOption;
|
||||
import io.netty.channel.EventLoopGroup;
|
||||
@ -84,7 +83,7 @@ public class NettyRemotingClient {
|
||||
/**
|
||||
* channels
|
||||
*/
|
||||
private final ConcurrentHashMap<Host, Channel> channels = new ConcurrentHashMap(128);
|
||||
private final ConcurrentHashMap<Host, Channel> channels = new ConcurrentHashMap<>(128);
|
||||
|
||||
/**
|
||||
* started flag
|
||||
@ -130,7 +129,7 @@ public class NettyRemotingClient {
|
||||
this.clientConfig = clientConfig;
|
||||
if (NettyUtils.useEpoll()) {
|
||||
this.workerGroup = new EpollEventLoopGroup(clientConfig.getWorkerThreads(), new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -139,7 +138,7 @@ public class NettyRemotingClient {
|
||||
});
|
||||
} else {
|
||||
this.workerGroup = new NioEventLoopGroup(clientConfig.getWorkerThreads(), new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -148,8 +147,8 @@ public class NettyRemotingClient {
|
||||
});
|
||||
}
|
||||
this.callbackExecutor = new ThreadPoolExecutor(5, 10, 1, TimeUnit.MINUTES,
|
||||
new LinkedBlockingQueue<>(1000), new NamedThreadFactory("CallbackExecutor", 10),
|
||||
new CallerThreadExecutePolicy());
|
||||
new LinkedBlockingQueue<>(1000), new NamedThreadFactory("CallbackExecutor", 10),
|
||||
new CallerThreadExecutePolicy());
|
||||
this.clientHandler = new NettyClientHandler(this, callbackExecutor);
|
||||
|
||||
this.responseFutureExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("ResponseFutureExecutor"));
|
||||
@ -163,40 +162,32 @@ public class NettyRemotingClient {
|
||||
private void start() {
|
||||
|
||||
this.bootstrap
|
||||
.group(this.workerGroup)
|
||||
.channel(NettyUtils.getSocketChannelClass())
|
||||
.option(ChannelOption.SO_KEEPALIVE, clientConfig.isSoKeepalive())
|
||||
.option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
|
||||
.option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
|
||||
.option(ChannelOption.SO_RCVBUF, clientConfig.getReceiveBufferSize())
|
||||
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientConfig.getConnectTimeoutMillis())
|
||||
.handler(new ChannelInitializer<SocketChannel>() {
|
||||
@Override
|
||||
public void initChannel(SocketChannel ch) {
|
||||
ch.pipeline()
|
||||
.addLast("client-idle-handler", new IdleStateHandler(Constants.NETTY_CLIENT_HEART_BEAT_TIME, 0, 0, TimeUnit.MILLISECONDS))
|
||||
.addLast(new NettyDecoder(), clientHandler, encoder);
|
||||
}
|
||||
});
|
||||
this.responseFutureExecutor.scheduleAtFixedRate(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ResponseFuture.scanFutureTable();
|
||||
}
|
||||
}, 5000, 1000, TimeUnit.MILLISECONDS);
|
||||
//
|
||||
.group(this.workerGroup)
|
||||
.channel(NettyUtils.getSocketChannelClass())
|
||||
.option(ChannelOption.SO_KEEPALIVE, clientConfig.isSoKeepalive())
|
||||
.option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
|
||||
.option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
|
||||
.option(ChannelOption.SO_RCVBUF, clientConfig.getReceiveBufferSize())
|
||||
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientConfig.getConnectTimeoutMillis())
|
||||
.handler(new ChannelInitializer<SocketChannel>() {
|
||||
@Override
|
||||
public void initChannel(SocketChannel ch) {
|
||||
ch.pipeline()
|
||||
.addLast("client-idle-handler", new IdleStateHandler(Constants.NETTY_CLIENT_HEART_BEAT_TIME, 0, 0, TimeUnit.MILLISECONDS))
|
||||
.addLast(new NettyDecoder(), clientHandler, encoder);
|
||||
}
|
||||
});
|
||||
this.responseFutureExecutor.scheduleAtFixedRate(ResponseFuture::scanFutureTable, 5000, 1000, TimeUnit.MILLISECONDS);
|
||||
isStarted.compareAndSet(false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* async send
|
||||
*
|
||||
* @param host host
|
||||
* @param command command
|
||||
* @param timeoutMillis timeoutMillis
|
||||
* @param host host
|
||||
* @param command command
|
||||
* @param timeoutMillis timeoutMillis
|
||||
* @param invokeCallback callback function
|
||||
* @throws InterruptedException
|
||||
* @throws RemotingException
|
||||
*/
|
||||
public void sendAsync(final Host host, final Command command,
|
||||
final long timeoutMillis,
|
||||
@ -205,53 +196,49 @@ public class NettyRemotingClient {
|
||||
if (channel == null) {
|
||||
throw new RemotingException("network error");
|
||||
}
|
||||
/**
|
||||
/*
|
||||
* request unique identification
|
||||
*/
|
||||
final long opaque = command.getOpaque();
|
||||
/**
|
||||
/*
|
||||
* control concurrency number
|
||||
*/
|
||||
boolean acquired = this.asyncSemaphore.tryAcquire(timeoutMillis, TimeUnit.MILLISECONDS);
|
||||
if (acquired) {
|
||||
final ReleaseSemaphore releaseSemaphore = new ReleaseSemaphore(this.asyncSemaphore);
|
||||
|
||||
/**
|
||||
/*
|
||||
* response future
|
||||
*/
|
||||
final ResponseFuture responseFuture = new ResponseFuture(opaque,
|
||||
timeoutMillis,
|
||||
invokeCallback,
|
||||
releaseSemaphore);
|
||||
timeoutMillis,
|
||||
invokeCallback,
|
||||
releaseSemaphore);
|
||||
try {
|
||||
channel.writeAndFlush(command).addListener(new ChannelFutureListener() {
|
||||
|
||||
@Override
|
||||
public void operationComplete(ChannelFuture future) throws Exception {
|
||||
if (future.isSuccess()) {
|
||||
responseFuture.setSendOk(true);
|
||||
return;
|
||||
} else {
|
||||
responseFuture.setSendOk(false);
|
||||
}
|
||||
responseFuture.setCause(future.cause());
|
||||
responseFuture.putResponse(null);
|
||||
try {
|
||||
responseFuture.executeInvokeCallback();
|
||||
} catch (Throwable ex) {
|
||||
logger.error("execute callback error", ex);
|
||||
} finally {
|
||||
responseFuture.release();
|
||||
}
|
||||
channel.writeAndFlush(command).addListener(future -> {
|
||||
if (future.isSuccess()) {
|
||||
responseFuture.setSendOk(true);
|
||||
return;
|
||||
} else {
|
||||
responseFuture.setSendOk(false);
|
||||
}
|
||||
responseFuture.setCause(future.cause());
|
||||
responseFuture.putResponse(null);
|
||||
try {
|
||||
responseFuture.executeInvokeCallback();
|
||||
} catch (Exception ex) {
|
||||
logger.error("execute callback error", ex);
|
||||
} finally {
|
||||
responseFuture.release();
|
||||
}
|
||||
});
|
||||
} catch (Throwable ex) {
|
||||
} catch (Exception ex) {
|
||||
responseFuture.release();
|
||||
throw new RemotingException(String.format("send command to host: %s failed", host), ex);
|
||||
}
|
||||
} else {
|
||||
String message = String.format("try to acquire async semaphore timeout: %d, waiting thread num: %d, total permits: %d",
|
||||
timeoutMillis, asyncSemaphore.getQueueLength(), asyncSemaphore.availablePermits());
|
||||
timeoutMillis, asyncSemaphore.getQueueLength(), asyncSemaphore.availablePermits());
|
||||
throw new RemotingTooMuchRequestException(message);
|
||||
}
|
||||
}
|
||||
@ -259,12 +246,10 @@ public class NettyRemotingClient {
|
||||
/**
|
||||
* sync send
|
||||
*
|
||||
* @param host host
|
||||
* @param command command
|
||||
* @param host host
|
||||
* @param command command
|
||||
* @param timeoutMillis timeoutMillis
|
||||
* @return command
|
||||
* @throws InterruptedException
|
||||
* @throws RemotingException
|
||||
*/
|
||||
public Command sendSync(final Host host, final Command command, final long timeoutMillis) throws InterruptedException, RemotingException {
|
||||
final Channel channel = getChannel(host);
|
||||
@ -273,21 +258,18 @@ public class NettyRemotingClient {
|
||||
}
|
||||
final long opaque = command.getOpaque();
|
||||
final ResponseFuture responseFuture = new ResponseFuture(opaque, timeoutMillis, null, null);
|
||||
channel.writeAndFlush(command).addListener(new ChannelFutureListener() {
|
||||
@Override
|
||||
public void operationComplete(ChannelFuture future) throws Exception {
|
||||
if (future.isSuccess()) {
|
||||
responseFuture.setSendOk(true);
|
||||
return;
|
||||
} else {
|
||||
responseFuture.setSendOk(false);
|
||||
}
|
||||
responseFuture.setCause(future.cause());
|
||||
responseFuture.putResponse(null);
|
||||
logger.error("send command {} to host {} failed", command, host);
|
||||
channel.writeAndFlush(command).addListener(future -> {
|
||||
if (future.isSuccess()) {
|
||||
responseFuture.setSendOk(true);
|
||||
return;
|
||||
} else {
|
||||
responseFuture.setSendOk(false);
|
||||
}
|
||||
responseFuture.setCause(future.cause());
|
||||
responseFuture.putResponse(null);
|
||||
logger.error("send command {} to host {} failed", command, host);
|
||||
});
|
||||
/**
|
||||
/*
|
||||
* sync wait for result
|
||||
*/
|
||||
Command result = responseFuture.waitResponse();
|
||||
@ -304,9 +286,8 @@ public class NettyRemotingClient {
|
||||
/**
|
||||
* send task
|
||||
*
|
||||
* @param host host
|
||||
* @param host host
|
||||
* @param command command
|
||||
* @throws RemotingException
|
||||
*/
|
||||
public void send(final Host host, final Command command) throws RemotingException {
|
||||
Channel channel = getChannel(host);
|
||||
@ -332,7 +313,7 @@ public class NettyRemotingClient {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param processor processor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
|
||||
this.registerProcessor(commandType, processor, null);
|
||||
@ -342,8 +323,8 @@ public class NettyRemotingClient {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
|
||||
this.clientHandler.registerProcessor(commandType, processor, executor);
|
||||
@ -351,9 +332,6 @@ public class NettyRemotingClient {
|
||||
|
||||
/**
|
||||
* get channel
|
||||
*
|
||||
* @param host
|
||||
* @return
|
||||
*/
|
||||
public Channel getChannel(Host host) {
|
||||
Channel channel = channels.get(host);
|
||||
@ -366,7 +344,7 @@ public class NettyRemotingClient {
|
||||
/**
|
||||
* create channel
|
||||
*
|
||||
* @param host host
|
||||
* @param host host
|
||||
* @param isSync sync flag
|
||||
* @return channel
|
||||
*/
|
||||
|
@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.remote.codec.NettyDecoder;
|
||||
import org.apache.dolphinscheduler.remote.codec.NettyEncoder;
|
||||
import org.apache.dolphinscheduler.remote.command.CommandType;
|
||||
import org.apache.dolphinscheduler.remote.config.NettyServerConfig;
|
||||
import org.apache.dolphinscheduler.remote.exceptions.RemoteException;
|
||||
import org.apache.dolphinscheduler.remote.handler.NettyServerHandler;
|
||||
import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor;
|
||||
import org.apache.dolphinscheduler.remote.utils.Constants;
|
||||
@ -93,6 +94,11 @@ public class NettyRemotingServer {
|
||||
*/
|
||||
private final AtomicBoolean isStarted = new AtomicBoolean(false);
|
||||
|
||||
/**
|
||||
* Netty server bind fail message
|
||||
*/
|
||||
private static final String NETTY_BIND_FAILURE_MSG = "NettyRemotingServer bind %s fail";
|
||||
|
||||
/**
|
||||
* server init
|
||||
*
|
||||
@ -102,7 +108,7 @@ public class NettyRemotingServer {
|
||||
this.serverConfig = serverConfig;
|
||||
if (NettyUtils.useEpoll()) {
|
||||
this.bossGroup = new EpollEventLoopGroup(1, new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -111,7 +117,7 @@ public class NettyRemotingServer {
|
||||
});
|
||||
|
||||
this.workGroup = new EpollEventLoopGroup(serverConfig.getWorkerThread(), new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -120,7 +126,7 @@ public class NettyRemotingServer {
|
||||
});
|
||||
} else {
|
||||
this.bossGroup = new NioEventLoopGroup(1, new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -129,7 +135,7 @@ public class NettyRemotingServer {
|
||||
});
|
||||
|
||||
this.workGroup = new NioEventLoopGroup(serverConfig.getWorkerThread(), new ThreadFactory() {
|
||||
private AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
private final AtomicInteger threadIndex = new AtomicInteger(0);
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
@ -145,35 +151,35 @@ public class NettyRemotingServer {
|
||||
public void start() {
|
||||
if (isStarted.compareAndSet(false, true)) {
|
||||
this.serverBootstrap
|
||||
.group(this.bossGroup, this.workGroup)
|
||||
.channel(NettyUtils.getServerSocketChannelClass())
|
||||
.option(ChannelOption.SO_REUSEADDR, true)
|
||||
.option(ChannelOption.SO_BACKLOG, serverConfig.getSoBacklog())
|
||||
.childOption(ChannelOption.SO_KEEPALIVE, serverConfig.isSoKeepalive())
|
||||
.childOption(ChannelOption.TCP_NODELAY, serverConfig.isTcpNoDelay())
|
||||
.childOption(ChannelOption.SO_SNDBUF, serverConfig.getSendBufferSize())
|
||||
.childOption(ChannelOption.SO_RCVBUF, serverConfig.getReceiveBufferSize())
|
||||
.childHandler(new ChannelInitializer<SocketChannel>() {
|
||||
.group(this.bossGroup, this.workGroup)
|
||||
.channel(NettyUtils.getServerSocketChannelClass())
|
||||
.option(ChannelOption.SO_REUSEADDR, true)
|
||||
.option(ChannelOption.SO_BACKLOG, serverConfig.getSoBacklog())
|
||||
.childOption(ChannelOption.SO_KEEPALIVE, serverConfig.isSoKeepalive())
|
||||
.childOption(ChannelOption.TCP_NODELAY, serverConfig.isTcpNoDelay())
|
||||
.childOption(ChannelOption.SO_SNDBUF, serverConfig.getSendBufferSize())
|
||||
.childOption(ChannelOption.SO_RCVBUF, serverConfig.getReceiveBufferSize())
|
||||
.childHandler(new ChannelInitializer<SocketChannel>() {
|
||||
|
||||
@Override
|
||||
protected void initChannel(SocketChannel ch) throws Exception {
|
||||
initNettyChannel(ch);
|
||||
}
|
||||
});
|
||||
@Override
|
||||
protected void initChannel(SocketChannel ch) {
|
||||
initNettyChannel(ch);
|
||||
}
|
||||
});
|
||||
|
||||
ChannelFuture future;
|
||||
try {
|
||||
future = serverBootstrap.bind(serverConfig.getListenPort()).sync();
|
||||
} catch (Exception e) {
|
||||
logger.error("NettyRemotingServer bind fail {}, exit", e.getMessage(), e);
|
||||
throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()));
|
||||
throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()));
|
||||
}
|
||||
if (future.isSuccess()) {
|
||||
logger.info("NettyRemotingServer bind success at port : {}", serverConfig.getListenPort());
|
||||
} else if (future.cause() != null) {
|
||||
throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()), future.cause());
|
||||
throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()), future.cause());
|
||||
} else {
|
||||
throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()));
|
||||
throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -185,17 +191,17 @@ public class NettyRemotingServer {
|
||||
*/
|
||||
private void initNettyChannel(SocketChannel ch) {
|
||||
ch.pipeline()
|
||||
.addLast("encoder", encoder)
|
||||
.addLast("decoder", new NettyDecoder())
|
||||
.addLast("server-idle-handle", new IdleStateHandler(0, 0, Constants.NETTY_SERVER_HEART_BEAT_TIME, TimeUnit.MILLISECONDS))
|
||||
.addLast("handler", serverHandler);
|
||||
.addLast("encoder", encoder)
|
||||
.addLast("decoder", new NettyDecoder())
|
||||
.addLast("server-idle-handle", new IdleStateHandler(0, 0, Constants.NETTY_SERVER_HEART_BEAT_TIME, TimeUnit.MILLISECONDS))
|
||||
.addLast("handler", serverHandler);
|
||||
}
|
||||
|
||||
/**
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param processor processor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
|
||||
this.registerProcessor(commandType, processor, null);
|
||||
@ -205,8 +211,8 @@ public class NettyRemotingServer {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
|
||||
this.serverHandler.registerProcessor(commandType, processor, executor);
|
||||
|
@ -14,16 +14,19 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.remote.codec;
|
||||
|
||||
import org.apache.dolphinscheduler.remote.command.Command;
|
||||
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandler.Sharable;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.codec.MessageToByteEncoder;
|
||||
import org.apache.dolphinscheduler.remote.command.Command;
|
||||
|
||||
/**
|
||||
* netty encoder
|
||||
* netty encoder
|
||||
*/
|
||||
@Sharable
|
||||
public class NettyEncoder extends MessageToByteEncoder<Command> {
|
||||
@ -34,12 +37,11 @@ public class NettyEncoder extends MessageToByteEncoder<Command> {
|
||||
* @param ctx channel handler context
|
||||
* @param msg command
|
||||
* @param out byte buffer
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
protected void encode(ChannelHandlerContext ctx, Command msg, ByteBuf out) throws Exception {
|
||||
if(msg == null){
|
||||
throw new Exception("encode msg is null");
|
||||
if (msg == null) {
|
||||
throw new RemotingException("encode msg is null");
|
||||
}
|
||||
out.writeByte(Command.MAGIC);
|
||||
out.writeByte(Command.VERSION);
|
||||
|
@ -23,7 +23,7 @@ import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* kill task response command
|
||||
* kill task response command
|
||||
*/
|
||||
public class TaskKillResponseCommand implements Serializable {
|
||||
|
||||
@ -51,7 +51,7 @@ public class TaskKillResponseCommand implements Serializable {
|
||||
/**
|
||||
* other resource manager appId , for example : YARN etc
|
||||
*/
|
||||
protected List<String> appIds;
|
||||
private List<String> appIds;
|
||||
|
||||
public int getTaskInstanceId() {
|
||||
return taskInstanceId;
|
||||
@ -94,7 +94,7 @@ public class TaskKillResponseCommand implements Serializable {
|
||||
}
|
||||
|
||||
/**
|
||||
* package request command
|
||||
* package request command
|
||||
*
|
||||
* @return command
|
||||
*/
|
||||
|
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.remote.exceptions;
|
||||
|
||||
/**
|
||||
* Custom runtime exception
|
||||
*/
|
||||
public class RemoteException extends RuntimeException {
|
||||
|
||||
/**
|
||||
* Construct a new runtime exception with the detail message
|
||||
*
|
||||
* @param message detail message
|
||||
*/
|
||||
public RemoteException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a new runtime exception with the detail message and cause
|
||||
*
|
||||
* @param message detail message
|
||||
*/
|
||||
public RemoteException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
@ -18,14 +18,17 @@
|
||||
package org.apache.dolphinscheduler.remote.future;
|
||||
|
||||
import org.apache.dolphinscheduler.remote.command.Command;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* response future
|
||||
@ -34,25 +37,25 @@ public class ResponseFuture {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ResponseFuture.class);
|
||||
|
||||
private static final ConcurrentHashMap<Long,ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
|
||||
private static final ConcurrentHashMap<Long, ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
|
||||
|
||||
/**
|
||||
* request unique identification
|
||||
* request unique identification
|
||||
*/
|
||||
private final long opaque;
|
||||
|
||||
/**
|
||||
* timeout
|
||||
* timeout
|
||||
*/
|
||||
private final long timeoutMillis;
|
||||
|
||||
/**
|
||||
* invokeCallback function
|
||||
* invokeCallback function
|
||||
*/
|
||||
private final InvokeCallback invokeCallback;
|
||||
|
||||
/**
|
||||
* releaseSemaphore
|
||||
* releaseSemaphore
|
||||
*/
|
||||
private final ReleaseSemaphore releaseSemaphore;
|
||||
|
||||
@ -61,7 +64,7 @@ public class ResponseFuture {
|
||||
private final long beginTimestamp = System.currentTimeMillis();
|
||||
|
||||
/**
|
||||
* response command
|
||||
* response command
|
||||
*/
|
||||
private Command responseCommand;
|
||||
|
||||
@ -78,10 +81,9 @@ public class ResponseFuture {
|
||||
}
|
||||
|
||||
/**
|
||||
* wait for response
|
||||
* wait for response
|
||||
*
|
||||
* @return command
|
||||
* @throws InterruptedException
|
||||
*/
|
||||
public Command waitResponse() throws InterruptedException {
|
||||
this.latch.await(timeoutMillis, TimeUnit.MILLISECONDS);
|
||||
@ -89,7 +91,7 @@ public class ResponseFuture {
|
||||
}
|
||||
|
||||
/**
|
||||
* put response
|
||||
* put response
|
||||
*
|
||||
* @param responseCommand responseCommand
|
||||
*/
|
||||
@ -99,12 +101,13 @@ public class ResponseFuture {
|
||||
FUTURE_TABLE.remove(opaque);
|
||||
}
|
||||
|
||||
public static ResponseFuture getFuture(long opaque){
|
||||
public static ResponseFuture getFuture(long opaque) {
|
||||
return FUTURE_TABLE.get(opaque);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether timeout
|
||||
* whether timeout
|
||||
*
|
||||
* @return timeout
|
||||
*/
|
||||
public boolean isTimeout() {
|
||||
@ -113,7 +116,7 @@ public class ResponseFuture {
|
||||
}
|
||||
|
||||
/**
|
||||
* execute invoke callback
|
||||
* execute invoke callback
|
||||
*/
|
||||
public void executeInvokeCallback() {
|
||||
if (invokeCallback != null) {
|
||||
@ -162,10 +165,10 @@ public class ResponseFuture {
|
||||
}
|
||||
|
||||
/**
|
||||
* release
|
||||
* release
|
||||
*/
|
||||
public void release() {
|
||||
if(this.releaseSemaphore != null){
|
||||
if (this.releaseSemaphore != null) {
|
||||
this.releaseSemaphore.release();
|
||||
}
|
||||
}
|
||||
@ -173,7 +176,7 @@ public class ResponseFuture {
|
||||
/**
|
||||
* scan future table
|
||||
*/
|
||||
public static void scanFutureTable(){
|
||||
public static void scanFutureTable() {
|
||||
final List<ResponseFuture> futureList = new LinkedList<>();
|
||||
Iterator<Map.Entry<Long, ResponseFuture>> it = FUTURE_TABLE.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
@ -189,7 +192,7 @@ public class ResponseFuture {
|
||||
try {
|
||||
future.release();
|
||||
future.executeInvokeCallback();
|
||||
} catch (Throwable ex) {
|
||||
} catch (Exception ex) {
|
||||
LOGGER.warn("scanFutureTable, execute callback error", ex);
|
||||
}
|
||||
}
|
||||
@ -197,16 +200,16 @@ public class ResponseFuture {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ResponseFuture{" +
|
||||
"opaque=" + opaque +
|
||||
", timeoutMillis=" + timeoutMillis +
|
||||
", invokeCallback=" + invokeCallback +
|
||||
", releaseSemaphore=" + releaseSemaphore +
|
||||
", latch=" + latch +
|
||||
", beginTimestamp=" + beginTimestamp +
|
||||
", responseCommand=" + responseCommand +
|
||||
", sendOk=" + sendOk +
|
||||
", cause=" + cause +
|
||||
'}';
|
||||
return "ResponseFuture{"
|
||||
+ "opaque=" + opaque
|
||||
+ ", timeoutMillis=" + timeoutMillis
|
||||
+ ", invokeCallback=" + invokeCallback
|
||||
+ ", releaseSemaphore=" + releaseSemaphore
|
||||
+ ", latch=" + latch
|
||||
+ ", beginTimestamp=" + beginTimestamp
|
||||
+ ", responseCommand=" + responseCommand
|
||||
+ ", sendOk=" + sendOk
|
||||
+ ", cause=" + cause
|
||||
+ '}';
|
||||
}
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
public NettyClientHandler(NettyRemotingClient nettyRemotingClient, ExecutorService callbackExecutor) {
|
||||
this.nettyRemotingClient = nettyRemotingClient;
|
||||
this.callbackExecutor = callbackExecutor;
|
||||
this.processors = new ConcurrentHashMap();
|
||||
this.processors = new ConcurrentHashMap<>();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -82,10 +82,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
* the current channel has reached the end of its life cycle
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
|
||||
public void channelInactive(ChannelHandlerContext ctx) {
|
||||
nettyRemotingClient.closeChannel(ChannelUtils.toAddress(ctx.channel()));
|
||||
ctx.channel().close();
|
||||
}
|
||||
@ -95,10 +94,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @param msg message
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
|
||||
public void channelRead(ChannelHandlerContext ctx, Object msg) {
|
||||
processReceived(ctx.channel(), (Command) msg);
|
||||
}
|
||||
|
||||
@ -106,7 +104,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param processor processor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
|
||||
this.registerProcessor(commandType, processor, null);
|
||||
@ -116,8 +114,8 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
|
||||
ExecutorService executorRef = executor;
|
||||
@ -138,12 +136,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
future.setResponseCommand(command);
|
||||
future.release();
|
||||
if (future.getInvokeCallback() != null) {
|
||||
this.callbackExecutor.submit(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
future.executeInvokeCallback();
|
||||
}
|
||||
});
|
||||
this.callbackExecutor.submit(future::executeInvokeCallback);
|
||||
} else {
|
||||
future.putResponse(command);
|
||||
}
|
||||
@ -158,7 +151,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
Runnable run = () -> {
|
||||
try {
|
||||
pair.getLeft().process(channel, command);
|
||||
} catch (Throwable e) {
|
||||
} catch (Exception e) {
|
||||
logger.error(String.format("process command %s exception", command), e);
|
||||
}
|
||||
};
|
||||
@ -175,13 +168,12 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
/**
|
||||
* caught exception
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @param ctx channel handler context
|
||||
* @param cause cause
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
|
||||
logger.error("exceptionCaught : {}", cause);
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
|
||||
logger.error("exceptionCaught : {}", cause.getMessage(), cause);
|
||||
nettyRemotingClient.closeChannel(ChannelUtils.toAddress(ctx.channel()));
|
||||
ctx.channel().close();
|
||||
}
|
||||
@ -193,11 +185,11 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
|
||||
heartBeat.setType(CommandType.HEART_BEAT);
|
||||
heartBeat.setBody(heartBeatData);
|
||||
ctx.writeAndFlush(heartBeat)
|
||||
.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
|
||||
.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
|
||||
|
||||
} else {
|
||||
super.userEventTriggered(ctx, evt);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
/**
|
||||
* server processors queue
|
||||
*/
|
||||
private final ConcurrentHashMap<CommandType, Pair<NettyRequestProcessor, ExecutorService>> processors = new ConcurrentHashMap();
|
||||
private final ConcurrentHashMap<CommandType, Pair<NettyRequestProcessor, ExecutorService>> processors = new ConcurrentHashMap<>();
|
||||
|
||||
public NettyServerHandler(NettyRemotingServer nettyRemotingServer) {
|
||||
this.nettyRemotingServer = nettyRemotingServer;
|
||||
@ -66,10 +66,9 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
* the current channel has reached the end of its life cycle
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
|
||||
public void channelInactive(ChannelHandlerContext ctx) {
|
||||
ctx.channel().close();
|
||||
}
|
||||
|
||||
@ -78,10 +77,9 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @param msg message
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
|
||||
public void channelRead(ChannelHandlerContext ctx, Object msg) {
|
||||
processReceived(ctx.channel(), (Command) msg);
|
||||
}
|
||||
|
||||
@ -89,7 +87,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param processor processor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
|
||||
this.registerProcessor(commandType, processor, null);
|
||||
@ -99,8 +97,8 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
* register processor
|
||||
*
|
||||
* @param commandType command type
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
* @param processor processor
|
||||
* @param executor thread executor
|
||||
*/
|
||||
public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
|
||||
ExecutorService executorRef = executor;
|
||||
@ -114,21 +112,17 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
* process received logic
|
||||
*
|
||||
* @param channel channel
|
||||
* @param msg message
|
||||
* @param msg message
|
||||
*/
|
||||
private void processReceived(final Channel channel, final Command msg) {
|
||||
final CommandType commandType = msg.getType();
|
||||
final Pair<NettyRequestProcessor, ExecutorService> pair = processors.get(commandType);
|
||||
if (pair != null) {
|
||||
Runnable r = new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
pair.getLeft().process(channel, msg);
|
||||
} catch (Throwable ex) {
|
||||
logger.error("process msg {} error", msg, ex);
|
||||
}
|
||||
Runnable r = () -> {
|
||||
try {
|
||||
pair.getLeft().process(channel, msg);
|
||||
} catch (Exception ex) {
|
||||
logger.error("process msg {} error", msg, ex);
|
||||
}
|
||||
};
|
||||
try {
|
||||
@ -144,9 +138,8 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
/**
|
||||
* caught exception
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @param ctx channel handler context
|
||||
* @param cause cause
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
|
||||
@ -158,7 +151,6 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
* channel write changed
|
||||
*
|
||||
* @param ctx channel handler context
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
|
||||
@ -168,14 +160,14 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
if (!ch.isWritable()) {
|
||||
if (logger.isWarnEnabled()) {
|
||||
logger.warn("{} is not writable, over high water level : {}",
|
||||
ch, config.getWriteBufferHighWaterMark());
|
||||
ch, config.getWriteBufferHighWaterMark());
|
||||
}
|
||||
|
||||
config.setAutoRead(false);
|
||||
} else {
|
||||
if (logger.isWarnEnabled()) {
|
||||
logger.warn("{} is writable, to low water : {}",
|
||||
ch, config.getWriteBufferLowWaterMark());
|
||||
ch, config.getWriteBufferLowWaterMark());
|
||||
}
|
||||
config.setAutoRead(true);
|
||||
}
|
||||
@ -189,4 +181,4 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
|
||||
super.userEventTriggered(ctx, evt);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -14,43 +14,50 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.dolphinscheduler.remote.utils;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
package org.apache.dolphinscheduler.remote.utils;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
|
||||
/**
|
||||
* channel utils
|
||||
* channel utils
|
||||
*/
|
||||
public class ChannelUtils {
|
||||
|
||||
private ChannelUtils() {
|
||||
throw new IllegalStateException(ChannelUtils.class.getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* get local address
|
||||
* get local address
|
||||
*
|
||||
* @param channel channel
|
||||
* @return local address
|
||||
*/
|
||||
public static String getLocalAddress(Channel channel){
|
||||
return ((InetSocketAddress)channel.localAddress()).getAddress().getHostAddress();
|
||||
public static String getLocalAddress(Channel channel) {
|
||||
return ((InetSocketAddress) channel.localAddress()).getAddress().getHostAddress();
|
||||
}
|
||||
|
||||
/**
|
||||
* get remote address
|
||||
* get remote address
|
||||
*
|
||||
* @param channel channel
|
||||
* @return remote address
|
||||
*/
|
||||
public static String getRemoteAddress(Channel channel){
|
||||
return ((InetSocketAddress)channel.remoteAddress()).getAddress().getHostAddress();
|
||||
public static String getRemoteAddress(Channel channel) {
|
||||
return ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
|
||||
}
|
||||
|
||||
/**
|
||||
* channel to address
|
||||
* channel to address
|
||||
*
|
||||
* @param channel channel
|
||||
* @return address
|
||||
*/
|
||||
public static Host toAddress(Channel channel){
|
||||
InetSocketAddress socketAddress = ((InetSocketAddress)channel.remoteAddress());
|
||||
public static Host toAddress(Channel channel) {
|
||||
InetSocketAddress socketAddress = ((InetSocketAddress) channel.remoteAddress());
|
||||
return new Host(socketAddress.getAddress().getHostAddress(), socketAddress.getPort());
|
||||
}
|
||||
|
||||
|
@ -25,6 +25,10 @@ import java.nio.charset.StandardCharsets;
|
||||
*/
|
||||
public class Constants {
|
||||
|
||||
private Constants() {
|
||||
throw new IllegalStateException(Constants.class.getName());
|
||||
}
|
||||
|
||||
public static final String COMMA = ",";
|
||||
|
||||
public static final String SLASH = "/";
|
||||
|
@ -16,6 +16,8 @@
|
||||
*/
|
||||
package org.apache.dolphinscheduler.remote.utils;
|
||||
|
||||
import org.apache.dolphinscheduler.remote.exceptions.RemoteException;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -28,22 +30,24 @@ import java.util.regex.Pattern;
|
||||
|
||||
public class IPUtils {
|
||||
|
||||
private IPUtils() {
|
||||
throw new IllegalStateException(IPUtils.class.getName());
|
||||
}
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(IPUtils.class);
|
||||
|
||||
private static String IP_REGEX = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
|
||||
|
||||
private static String LOCAL_HOST = "unknown";
|
||||
private static String localHost = "unknown";
|
||||
|
||||
static {
|
||||
String host = System.getenv("HOSTNAME");
|
||||
if (isNotEmpty(host)) {
|
||||
LOCAL_HOST = host;
|
||||
localHost = host;
|
||||
} else {
|
||||
|
||||
try {
|
||||
String hostName = InetAddress.getLocalHost().getHostName();
|
||||
if (isNotEmpty(hostName)) {
|
||||
LOCAL_HOST = hostName;
|
||||
localHost = hostName;
|
||||
}
|
||||
} catch (UnknownHostException e) {
|
||||
logger.error("get hostName error!", e);
|
||||
@ -52,7 +56,7 @@ public class IPUtils {
|
||||
}
|
||||
|
||||
public static String getLocalHost() {
|
||||
return LOCAL_HOST;
|
||||
return localHost;
|
||||
}
|
||||
|
||||
|
||||
@ -100,7 +104,7 @@ public class IPUtils {
|
||||
|
||||
return addresses;
|
||||
} catch (SocketException e) {
|
||||
throw new RuntimeException(e.getMessage(), e);
|
||||
throw new RemoteException(e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -131,12 +135,11 @@ public class IPUtils {
|
||||
return false;
|
||||
}
|
||||
|
||||
Pattern pat = Pattern.compile(IP_REGEX);
|
||||
String ipRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
|
||||
Pattern pat = Pattern.compile(ipRegex);
|
||||
|
||||
Matcher mat = pat.matcher(addr);
|
||||
|
||||
boolean ipAddress = mat.find();
|
||||
|
||||
return ipAddress;
|
||||
return mat.find();
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,6 @@
|
||||
|
||||
package org.apache.dolphinscheduler.remote.utils;
|
||||
|
||||
|
||||
/**
|
||||
* key value pair
|
||||
*
|
||||
@ -51,7 +50,7 @@ public class Pair<L, R> {
|
||||
this.right = right;
|
||||
}
|
||||
|
||||
public static <L, R> Pair of(L left, R right){
|
||||
return new Pair(left, right);
|
||||
public static <L, R> Pair<L, R> of(L left, R right) {
|
||||
return new Pair<>(left, right);
|
||||
}
|
||||
}
|
||||
|
@ -14,6 +14,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.bean;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
@ -31,9 +32,7 @@ public class SpringApplicationContext implements ApplicationContextAware {
|
||||
SpringApplicationContext.applicationContext = applicationContext;
|
||||
}
|
||||
|
||||
public static <T> T getBean(Class<T> requiredType){
|
||||
public static <T> T getBean(Class<T> requiredType) {
|
||||
return applicationContext.getBean(requiredType);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* 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 org.apache.dolphinscheduler.service.exceptions;
|
||||
|
||||
/**
|
||||
* Custom ZKServerException exception
|
||||
*/
|
||||
public class ServiceException extends RuntimeException {
|
||||
|
||||
/**
|
||||
* Construct a new runtime exception with the error message
|
||||
*
|
||||
* @param errMsg Error message
|
||||
*/
|
||||
public ServiceException(String errMsg) {
|
||||
super(errMsg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a new runtime exception with the cause
|
||||
*
|
||||
* @param cause cause
|
||||
*/
|
||||
public ServiceException(Throwable cause) {
|
||||
super(cause);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a new runtime exception with the detail message and cause
|
||||
*
|
||||
* @param errMsg message
|
||||
* @param cause cause
|
||||
*/
|
||||
public ServiceException(String errMsg, Throwable cause) {
|
||||
super(errMsg, cause);
|
||||
}
|
||||
}
|
@ -14,6 +14,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.permission;
|
||||
|
||||
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
|
||||
@ -21,11 +22,13 @@ import org.apache.dolphinscheduler.common.enums.UserType;
|
||||
import org.apache.dolphinscheduler.common.process.ResourceInfo;
|
||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||
import org.apache.dolphinscheduler.dao.entity.User;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
import org.apache.dolphinscheduler.service.process.ProcessService;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
|
||||
public class PermissionCheck<T> {
|
||||
/**
|
||||
* logger
|
||||
@ -58,8 +61,9 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* permission check
|
||||
*
|
||||
* @param authorizationType authorization type
|
||||
* @param processService process dao
|
||||
* @param processService process dao
|
||||
*/
|
||||
public PermissionCheck(AuthorizationType authorizationType, ProcessService processService) {
|
||||
this.authorizationType = authorizationType;
|
||||
@ -68,10 +72,6 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* permission check
|
||||
* @param authorizationType
|
||||
* @param processService
|
||||
* @param needChecks
|
||||
* @param userId
|
||||
*/
|
||||
public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId) {
|
||||
this.authorizationType = authorizationType;
|
||||
@ -82,11 +82,6 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* permission check
|
||||
* @param authorizationType
|
||||
* @param processService
|
||||
* @param needChecks
|
||||
* @param userId
|
||||
* @param logger
|
||||
*/
|
||||
public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId, Logger logger) {
|
||||
this.authorizationType = authorizationType;
|
||||
@ -98,13 +93,8 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* permission check
|
||||
* @param logger
|
||||
* @param authorizationType
|
||||
* @param processService
|
||||
* @param resourceList
|
||||
* @param userId
|
||||
*/
|
||||
public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, List<ResourceInfo> resourceList, int userId,Logger logger) {
|
||||
public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, List<ResourceInfo> resourceList, int userId, Logger logger) {
|
||||
this.authorizationType = authorizationType;
|
||||
this.processService = processService;
|
||||
this.resourceList = resourceList;
|
||||
@ -154,9 +144,10 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* has permission
|
||||
*
|
||||
* @return true if has permission
|
||||
*/
|
||||
public boolean hasPermission(){
|
||||
public boolean hasPermission() {
|
||||
try {
|
||||
checkPermission();
|
||||
return true;
|
||||
@ -167,23 +158,24 @@ public class PermissionCheck<T> {
|
||||
|
||||
/**
|
||||
* check permission
|
||||
* @throws Exception exception
|
||||
*
|
||||
* @throws ServiceException exception
|
||||
*/
|
||||
public void checkPermission() throws Exception{
|
||||
if(this.needChecks.length > 0){
|
||||
public void checkPermission() throws ServiceException {
|
||||
if (this.needChecks.length > 0) {
|
||||
|
||||
// get user type in order to judge whether the user is admin
|
||||
User user = processService.getUserById(userId);
|
||||
if (user == null) {
|
||||
logger.error("user id {} didn't exist",userId);
|
||||
throw new RuntimeException(String.format("user %s didn't exist",userId));
|
||||
logger.error("user id {} doesn't exist", userId);
|
||||
throw new ServiceException(String.format("user %s doesn't exist", userId));
|
||||
}
|
||||
if (user.getUserType() != UserType.ADMIN_USER){
|
||||
List<T> unauthorizedList = processService.listUnauthorized(userId,needChecks,authorizationType);
|
||||
if (user.getUserType() != UserType.ADMIN_USER) {
|
||||
List<T> unauthorizedList = processService.listUnauthorized(userId, needChecks, authorizationType);
|
||||
// if exist unauthorized resource
|
||||
if(CollectionUtils.isNotEmpty(unauthorizedList)){
|
||||
logger.error("user {} didn't has permission of {}: {}", user.getUserName(), authorizationType.getDescp(),unauthorizedList);
|
||||
throw new RuntimeException(String.format("user %s didn't has permission of %s %s", user.getUserName(), authorizationType.getDescp(), unauthorizedList.get(0)));
|
||||
if (CollectionUtils.isNotEmpty(unauthorizedList)) {
|
||||
logger.error("user {} doesn't have permission of {}: {}", user.getUserName(), authorizationType.getDescp(), unauthorizedList);
|
||||
throw new ServiceException(String.format("user %s doesn't have permission of %s %s", user.getUserName(), authorizationType.getDescp(), unauthorizedList.get(0)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -84,6 +84,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@ -110,11 +111,11 @@ public class ProcessService {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(getClass());
|
||||
|
||||
private final int[] stateArray = new int[] {ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
|
||||
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
|
||||
ExecutionStatus.DELAY_EXECUTION.ordinal(),
|
||||
ExecutionStatus.READY_PAUSE.ordinal(),
|
||||
ExecutionStatus.READY_STOP.ordinal()};
|
||||
private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
|
||||
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
|
||||
ExecutionStatus.DELAY_EXECUTION.ordinal(),
|
||||
ExecutionStatus.READY_PAUSE.ordinal(),
|
||||
ExecutionStatus.READY_STOP.ordinal()};
|
||||
|
||||
@Autowired
|
||||
private UserMapper userMapper;
|
||||
@ -158,16 +159,16 @@ public class ProcessService {
|
||||
/**
|
||||
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
|
||||
*
|
||||
* @param logger logger
|
||||
* @param host host
|
||||
* @param logger logger
|
||||
* @param host host
|
||||
* @param validThreadNum validThreadNum
|
||||
* @param command found command
|
||||
* @param command found command
|
||||
* @return process instance
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, Command command) {
|
||||
ProcessInstance processInstance = constructProcessInstance(command, host);
|
||||
//cannot construct process instance, return null;
|
||||
// cannot construct process instance, return null
|
||||
if (processInstance == null) {
|
||||
logger.error("scan command, command parameter is error: {}", command);
|
||||
moveToErrorCommand(command, "process instance is null");
|
||||
@ -201,7 +202,7 @@ public class ProcessService {
|
||||
/**
|
||||
* set process waiting thread
|
||||
*
|
||||
* @param command command
|
||||
* @param command command
|
||||
* @param processInstance processInstance
|
||||
* @return process instance
|
||||
*/
|
||||
@ -219,7 +220,7 @@ public class ProcessService {
|
||||
/**
|
||||
* check thread num
|
||||
*
|
||||
* @param command command
|
||||
* @param command command
|
||||
* @param validThreadNum validThreadNum
|
||||
* @return if thread is enough
|
||||
*/
|
||||
@ -259,7 +260,7 @@ public class ProcessService {
|
||||
*/
|
||||
public Boolean verifyIsNeedCreateCommand(Command command) {
|
||||
Boolean isNeedCreate = true;
|
||||
Map<CommandType, Integer> cmdTypeMap = new HashMap<CommandType, Integer>();
|
||||
EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class);
|
||||
cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1);
|
||||
cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1);
|
||||
cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1);
|
||||
@ -296,9 +297,6 @@ public class ProcessService {
|
||||
|
||||
/**
|
||||
* get task node list by definitionId
|
||||
*
|
||||
* @param defineId
|
||||
* @return
|
||||
*/
|
||||
public List<TaskNode> getTaskNodeListByDefinitionId(Integer defineId) {
|
||||
ProcessDefinition processDefinition = processDefineMapper.selectById(defineId);
|
||||
@ -425,7 +423,7 @@ public class ProcessService {
|
||||
* recursive query sub process definition id by parent id.
|
||||
*
|
||||
* @param parentId parentId
|
||||
* @param ids ids
|
||||
* @param ids ids
|
||||
*/
|
||||
public void recurseFindSubProcessId(int parentId, List<Integer> ids) {
|
||||
ProcessDefinition processDefinition = processDefineMapper.selectById(parentId);
|
||||
@ -435,7 +433,7 @@ public class ProcessService {
|
||||
|
||||
List<TaskNode> taskNodeList = processData.getTasks();
|
||||
|
||||
if (taskNodeList != null && taskNodeList.size() > 0) {
|
||||
if (taskNodeList != null && !taskNodeList.isEmpty()) {
|
||||
|
||||
for (TaskNode taskNode : taskNodeList) {
|
||||
String parameter = taskNode.getParams();
|
||||
@ -456,7 +454,7 @@ public class ProcessService {
|
||||
* create recovery waiting thread command and delete origin command at the same time.
|
||||
* if the recovery command is exists, only update the field update_time
|
||||
*
|
||||
* @param originCommand originCommand
|
||||
* @param originCommand originCommand
|
||||
* @param processInstance processInstance
|
||||
*/
|
||||
public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
|
||||
@ -473,17 +471,17 @@ public class ProcessService {
|
||||
// process instance quit by "waiting thread" state
|
||||
if (originCommand == null) {
|
||||
Command command = new Command(
|
||||
CommandType.RECOVER_WAITTING_THREAD,
|
||||
processInstance.getTaskDependType(),
|
||||
processInstance.getFailureStrategy(),
|
||||
processInstance.getExecutorId(),
|
||||
processInstance.getProcessDefinitionId(),
|
||||
JSONUtils.toJsonString(cmdParam),
|
||||
processInstance.getWarningType(),
|
||||
processInstance.getWarningGroupId(),
|
||||
processInstance.getScheduleTime(),
|
||||
processInstance.getWorkerGroup(),
|
||||
processInstance.getProcessInstancePriority()
|
||||
CommandType.RECOVER_WAITTING_THREAD,
|
||||
processInstance.getTaskDependType(),
|
||||
processInstance.getFailureStrategy(),
|
||||
processInstance.getExecutorId(),
|
||||
processInstance.getProcessDefinitionId(),
|
||||
JSONUtils.toJsonString(cmdParam),
|
||||
processInstance.getWarningType(),
|
||||
processInstance.getWarningGroupId(),
|
||||
processInstance.getScheduleTime(),
|
||||
processInstance.getWorkerGroup(),
|
||||
processInstance.getProcessInstancePriority()
|
||||
);
|
||||
saveCommand(command);
|
||||
return;
|
||||
@ -508,16 +506,14 @@ public class ProcessService {
|
||||
/**
|
||||
* get schedule time from command
|
||||
*
|
||||
* @param command command
|
||||
* @param command command
|
||||
* @param cmdParam cmdParam map
|
||||
* @return date
|
||||
*/
|
||||
private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
|
||||
Date scheduleTime = command.getScheduleTime();
|
||||
if (scheduleTime == null) {
|
||||
if (cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
|
||||
scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
|
||||
}
|
||||
if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
|
||||
scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
|
||||
}
|
||||
return scheduleTime;
|
||||
}
|
||||
@ -526,8 +522,8 @@ public class ProcessService {
|
||||
* generate a new work process instance from command.
|
||||
*
|
||||
* @param processDefinition processDefinition
|
||||
* @param command command
|
||||
* @param cmdParam cmdParam map
|
||||
* @param command command
|
||||
* @param cmdParam cmdParam map
|
||||
* @return process instance
|
||||
*/
|
||||
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
|
||||
@ -580,10 +576,10 @@ public class ProcessService {
|
||||
|
||||
// curing global params
|
||||
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
|
||||
processDefinition.getGlobalParamMap(),
|
||||
processDefinition.getGlobalParamList(),
|
||||
getCommandTypeIfComplement(processInstance, command),
|
||||
processInstance.getScheduleTime()));
|
||||
processDefinition.getGlobalParamMap(),
|
||||
processDefinition.getGlobalParamList(),
|
||||
getCommandTypeIfComplement(processInstance, command),
|
||||
processInstance.getScheduleTime()));
|
||||
|
||||
//copy process define json to process instance
|
||||
processInstance.setProcessInstanceJson(processDefinition.getProcessDefinitionJson());
|
||||
@ -603,7 +599,7 @@ public class ProcessService {
|
||||
* use definition creator's tenant.
|
||||
*
|
||||
* @param tenantId tenantId
|
||||
* @param userId userId
|
||||
* @param userId userId
|
||||
* @return tenant
|
||||
*/
|
||||
public Tenant getTenantForProcess(int tenantId, int userId) {
|
||||
@ -626,15 +622,15 @@ public class ProcessService {
|
||||
/**
|
||||
* check command parameters is valid
|
||||
*
|
||||
* @param command command
|
||||
* @param command command
|
||||
* @param cmdParam cmdParam map
|
||||
* @return whether command param is valid
|
||||
*/
|
||||
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
|
||||
if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
|
||||
if (cmdParam == null
|
||||
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
|
||||
|| cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
|
||||
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
|
||||
|| cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
|
||||
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
|
||||
return false;
|
||||
}
|
||||
@ -646,7 +642,7 @@ public class ProcessService {
|
||||
* construct process instance according to one command.
|
||||
*
|
||||
* @param command command
|
||||
* @param host host
|
||||
* @param host host
|
||||
* @return process instance
|
||||
*/
|
||||
private ProcessInstance constructProcessInstance(Command command, String host) {
|
||||
@ -714,7 +710,7 @@ public class ProcessService {
|
||||
// generate one new process instance
|
||||
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
|
||||
}
|
||||
if (!checkCmdParam(command, cmdParam)) {
|
||||
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
|
||||
logger.error("command parameter check failed!");
|
||||
return null;
|
||||
}
|
||||
@ -742,7 +738,7 @@ public class ProcessService {
|
||||
initTaskInstance(this.findTaskInstanceById(taskId));
|
||||
}
|
||||
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING,
|
||||
String.join(Constants.COMMA, convertIntListToString(failedList)));
|
||||
String.join(Constants.COMMA, convertIntListToString(failedList)));
|
||||
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
|
||||
processInstance.setRunTimes(runTime + 1);
|
||||
break;
|
||||
@ -755,7 +751,7 @@ public class ProcessService {
|
||||
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
|
||||
List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE);
|
||||
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
|
||||
ExecutionStatus.KILL);
|
||||
ExecutionStatus.KILL);
|
||||
suspendedNodeList.addAll(stopNodeList);
|
||||
for (Integer taskId : suspendedNodeList) {
|
||||
// initialize the pause state
|
||||
@ -809,7 +805,7 @@ public class ProcessService {
|
||||
* return complement data if the process start with complement data
|
||||
*
|
||||
* @param processInstance processInstance
|
||||
* @param command command
|
||||
* @param command command
|
||||
* @return command type
|
||||
*/
|
||||
private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
|
||||
@ -824,8 +820,8 @@ public class ProcessService {
|
||||
* initialize complement data parameters
|
||||
*
|
||||
* @param processDefinition processDefinition
|
||||
* @param processInstance processInstance
|
||||
* @param cmdParam cmdParam
|
||||
* @param processInstance processInstance
|
||||
* @param cmdParam cmdParam
|
||||
*/
|
||||
private void initComplementDataParam(ProcessDefinition processDefinition,
|
||||
ProcessInstance processInstance,
|
||||
@ -835,14 +831,14 @@ public class ProcessService {
|
||||
}
|
||||
|
||||
Date startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE),
|
||||
YYYY_MM_DD_HH_MM_SS);
|
||||
YYYY_MM_DD_HH_MM_SS);
|
||||
if (Flag.NO == processInstance.getIsSubProcess()) {
|
||||
processInstance.setScheduleTime(startComplementTime);
|
||||
}
|
||||
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
|
||||
processDefinition.getGlobalParamMap(),
|
||||
processDefinition.getGlobalParamList(),
|
||||
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
|
||||
processDefinition.getGlobalParamMap(),
|
||||
processDefinition.getGlobalParamList(),
|
||||
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
|
||||
|
||||
}
|
||||
|
||||
@ -862,7 +858,7 @@ public class ProcessService {
|
||||
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
|
||||
// write sub process id into cmd param.
|
||||
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
|
||||
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
|
||||
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
|
||||
paramMap.remove(CMD_PARAM_SUB_PROCESS);
|
||||
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
|
||||
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
|
||||
@ -875,7 +871,7 @@ public class ProcessService {
|
||||
ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
|
||||
if (parentInstance != null) {
|
||||
subProcessInstance.setGlobalParams(
|
||||
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
|
||||
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
|
||||
this.saveProcessInstance(subProcessInstance);
|
||||
} else {
|
||||
logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
|
||||
@ -897,7 +893,7 @@ public class ProcessService {
|
||||
* only the keys doesn't in sub process global would be joined.
|
||||
*
|
||||
* @param parentGlobalParams parentGlobalParams
|
||||
* @param subGlobalParams subGlobalParams
|
||||
* @param subGlobalParams subGlobalParams
|
||||
* @return global params join
|
||||
*/
|
||||
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
|
||||
@ -922,12 +918,11 @@ public class ProcessService {
|
||||
*/
|
||||
private void initTaskInstance(TaskInstance taskInstance) {
|
||||
|
||||
if (!taskInstance.isSubProcess()) {
|
||||
if (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure()) {
|
||||
taskInstance.setFlag(Flag.NO);
|
||||
updateTaskInstance(taskInstance);
|
||||
return;
|
||||
}
|
||||
if (!taskInstance.isSubProcess()
|
||||
&& (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) {
|
||||
taskInstance.setFlag(Flag.NO);
|
||||
updateTaskInstance(taskInstance);
|
||||
return;
|
||||
}
|
||||
taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
|
||||
updateTaskInstance(taskInstance);
|
||||
@ -944,12 +939,12 @@ public class ProcessService {
|
||||
public TaskInstance submitTask(TaskInstance taskInstance) {
|
||||
ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
|
||||
logger.info("start submit task : {}, instance id:{}, state: {}",
|
||||
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
|
||||
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
|
||||
//submit to db
|
||||
TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
|
||||
if (task == null) {
|
||||
logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
|
||||
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
|
||||
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
|
||||
return task;
|
||||
}
|
||||
if (!task.getState().typeIsFinished()) {
|
||||
@ -957,7 +952,7 @@ public class ProcessService {
|
||||
}
|
||||
|
||||
logger.info("end submit task to db successfully:{} state:{} complete, instance id:{} state: {} ",
|
||||
taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
|
||||
taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
|
||||
return task;
|
||||
}
|
||||
|
||||
@ -968,7 +963,7 @@ public class ProcessService {
|
||||
* set map {parent instance id, task instance id, 0(child instance id)}
|
||||
*
|
||||
* @param parentInstance parentInstance
|
||||
* @param parentTask parentTask
|
||||
* @param parentTask parentTask
|
||||
* @return process instance map
|
||||
*/
|
||||
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) {
|
||||
@ -997,7 +992,7 @@ public class ProcessService {
|
||||
* find previous task work process map.
|
||||
*
|
||||
* @param parentProcessInstance parentProcessInstance
|
||||
* @param parentTask parentTask
|
||||
* @param parentTask parentTask
|
||||
* @return process instance map
|
||||
*/
|
||||
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
|
||||
@ -1015,7 +1010,7 @@ public class ProcessService {
|
||||
}
|
||||
}
|
||||
logger.info("sub process instance is not found,parent task:{},parent instance:{}",
|
||||
parentTask.getId(), parentProcessInstance.getId());
|
||||
parentTask.getId(), parentProcessInstance.getId());
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -1049,10 +1044,6 @@ public class ProcessService {
|
||||
|
||||
/**
|
||||
* complement data needs transform parent parameter to child.
|
||||
*
|
||||
* @param instanceMap
|
||||
* @param parentProcessInstance
|
||||
* @return
|
||||
*/
|
||||
private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance) {
|
||||
// set sub work process command
|
||||
@ -1071,11 +1062,6 @@ public class ProcessService {
|
||||
|
||||
/**
|
||||
* create sub work process command
|
||||
*
|
||||
* @param parentProcessInstance
|
||||
* @param childInstance
|
||||
* @param instanceMap
|
||||
* @param task
|
||||
*/
|
||||
public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
|
||||
ProcessInstance childInstance,
|
||||
@ -1088,25 +1074,23 @@ public class ProcessService {
|
||||
String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance);
|
||||
|
||||
return new Command(
|
||||
commandType,
|
||||
TaskDependType.TASK_POST,
|
||||
parentProcessInstance.getFailureStrategy(),
|
||||
parentProcessInstance.getExecutorId(),
|
||||
childDefineId,
|
||||
processParam,
|
||||
parentProcessInstance.getWarningType(),
|
||||
parentProcessInstance.getWarningGroupId(),
|
||||
parentProcessInstance.getScheduleTime(),
|
||||
task.getWorkerGroup(),
|
||||
parentProcessInstance.getProcessInstancePriority()
|
||||
commandType,
|
||||
TaskDependType.TASK_POST,
|
||||
parentProcessInstance.getFailureStrategy(),
|
||||
parentProcessInstance.getExecutorId(),
|
||||
childDefineId,
|
||||
processParam,
|
||||
parentProcessInstance.getWarningType(),
|
||||
parentProcessInstance.getWarningGroupId(),
|
||||
parentProcessInstance.getScheduleTime(),
|
||||
task.getWorkerGroup(),
|
||||
parentProcessInstance.getProcessInstancePriority()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* initialize sub work flow state
|
||||
* child instance state would be initialized when 'recovery from pause/stop/failure'
|
||||
*
|
||||
* @param childInstance
|
||||
*/
|
||||
private void initSubInstanceState(ProcessInstance childInstance) {
|
||||
if (childInstance != null) {
|
||||
@ -1119,9 +1103,6 @@ public class ProcessService {
|
||||
* get sub work flow command type
|
||||
* child instance exist: child command = fatherCommand
|
||||
* child instance not exists: child command = fatherCommand[0]
|
||||
*
|
||||
* @param parentProcessInstance
|
||||
* @return
|
||||
*/
|
||||
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
|
||||
CommandType commandType = parentProcessInstance.getCommandType();
|
||||
@ -1136,7 +1117,7 @@ public class ProcessService {
|
||||
* update sub process definition
|
||||
*
|
||||
* @param parentProcessInstance parentProcessInstance
|
||||
* @param childDefinitionId childDefinitionId
|
||||
* @param childDefinitionId childDefinitionId
|
||||
*/
|
||||
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, int childDefinitionId) {
|
||||
ProcessDefinition fatherDefinition = this.findProcessDefineById(parentProcessInstance.getProcessDefinitionId());
|
||||
@ -1150,7 +1131,7 @@ public class ProcessService {
|
||||
/**
|
||||
* submit task to mysql
|
||||
*
|
||||
* @param taskInstance taskInstance
|
||||
* @param taskInstance taskInstance
|
||||
* @param processInstance processInstance
|
||||
* @return task instance
|
||||
*/
|
||||
@ -1163,7 +1144,7 @@ public class ProcessService {
|
||||
} else {
|
||||
|
||||
if (processInstanceState != ExecutionStatus.READY_STOP
|
||||
&& processInstanceState != ExecutionStatus.READY_PAUSE) {
|
||||
&& processInstanceState != ExecutionStatus.READY_PAUSE) {
|
||||
// failure task set invalid
|
||||
taskInstance.setFlag(Flag.NO);
|
||||
updateTaskInstance(taskInstance);
|
||||
@ -1204,19 +1185,19 @@ public class ProcessService {
|
||||
* return stop if work process state is ready stop
|
||||
* if all of above are not satisfied, return submit success
|
||||
*
|
||||
* @param taskInstance taskInstance
|
||||
* @param taskInstance taskInstance
|
||||
* @param processInstanceState processInstanceState
|
||||
* @return process instance state
|
||||
*/
|
||||
public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ExecutionStatus processInstanceState) {
|
||||
ExecutionStatus state = taskInstance.getState();
|
||||
if (
|
||||
// running, delayed or killed
|
||||
// the task already exists in task queue
|
||||
// return state
|
||||
state == ExecutionStatus.RUNNING_EXECUTION
|
||||
|| state == ExecutionStatus.DELAY_EXECUTION
|
||||
|| state == ExecutionStatus.KILL
|
||||
// running, delayed or killed
|
||||
// the task already exists in task queue
|
||||
// return state
|
||||
state == ExecutionStatus.RUNNING_EXECUTION
|
||||
|| state == ExecutionStatus.DELAY_EXECUTION
|
||||
|| state == ExecutionStatus.KILL
|
||||
) {
|
||||
return state;
|
||||
}
|
||||
@ -1225,7 +1206,7 @@ public class ProcessService {
|
||||
if (processInstanceState == ExecutionStatus.READY_PAUSE) {
|
||||
state = ExecutionStatus.PAUSE;
|
||||
} else if (processInstanceState == ExecutionStatus.READY_STOP
|
||||
|| !checkProcessStrategy(taskInstance)) {
|
||||
|| !checkProcessStrategy(taskInstance)) {
|
||||
state = ExecutionStatus.KILL;
|
||||
} else {
|
||||
state = ExecutionStatus.SUBMITTED_SUCCESS;
|
||||
@ -1380,7 +1361,7 @@ public class ProcessService {
|
||||
* get id list by task state
|
||||
*
|
||||
* @param instanceId instanceId
|
||||
* @param state state
|
||||
* @param state state
|
||||
* @return task instance states
|
||||
*/
|
||||
public List<Integer> findTaskIdByInstanceState(int instanceId, ExecutionStatus state) {
|
||||
@ -1435,7 +1416,7 @@ public class ProcessService {
|
||||
* find work process map by parent process id and parent task id.
|
||||
*
|
||||
* @param parentWorkProcessId parentWorkProcessId
|
||||
* @param parentTaskId parentTaskId
|
||||
* @param parentTaskId parentTaskId
|
||||
* @return process instance map
|
||||
*/
|
||||
public ProcessInstanceMap findWorkProcessMapByParent(Integer parentWorkProcessId, Integer parentTaskId) {
|
||||
@ -1457,7 +1438,7 @@ public class ProcessService {
|
||||
* find sub process instance
|
||||
*
|
||||
* @param parentProcessId parentProcessId
|
||||
* @param parentTaskId parentTaskId
|
||||
* @param parentTaskId parentTaskId
|
||||
* @return process instance
|
||||
*/
|
||||
public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) {
|
||||
@ -1489,12 +1470,12 @@ public class ProcessService {
|
||||
/**
|
||||
* change task state
|
||||
*
|
||||
* @param state state
|
||||
* @param startTime startTime
|
||||
* @param host host
|
||||
* @param state state
|
||||
* @param startTime startTime
|
||||
* @param host host
|
||||
* @param executePath executePath
|
||||
* @param logPath logPath
|
||||
* @param taskInstId taskInstId
|
||||
* @param logPath logPath
|
||||
* @param taskInstId taskInstId
|
||||
*/
|
||||
public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date startTime, String host,
|
||||
String executePath,
|
||||
@ -1522,12 +1503,12 @@ public class ProcessService {
|
||||
* update the process instance
|
||||
*
|
||||
* @param processInstanceId processInstanceId
|
||||
* @param processJson processJson
|
||||
* @param globalParams globalParams
|
||||
* @param scheduleTime scheduleTime
|
||||
* @param flag flag
|
||||
* @param locations locations
|
||||
* @param connects connects
|
||||
* @param processJson processJson
|
||||
* @param globalParams globalParams
|
||||
* @param scheduleTime scheduleTime
|
||||
* @param flag flag
|
||||
* @param locations locations
|
||||
* @param connects connects
|
||||
* @return update process instance result
|
||||
*/
|
||||
public int updateProcessInstance(Integer processInstanceId, String processJson,
|
||||
@ -1548,10 +1529,10 @@ public class ProcessService {
|
||||
/**
|
||||
* change task state
|
||||
*
|
||||
* @param state state
|
||||
* @param endTime endTime
|
||||
* @param state state
|
||||
* @param endTime endTime
|
||||
* @param taskInstId taskInstId
|
||||
* @param varPool varPool
|
||||
* @param varPool varPool
|
||||
*/
|
||||
public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state,
|
||||
Date endTime,
|
||||
@ -1577,7 +1558,7 @@ public class ProcessService {
|
||||
if (intList == null) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
List<String> result = new ArrayList<String>(intList.size());
|
||||
List<String> result = new ArrayList<>(intList.size());
|
||||
for (Integer intVar : intList) {
|
||||
result.add(String.valueOf(intVar));
|
||||
}
|
||||
@ -1642,7 +1623,7 @@ public class ProcessService {
|
||||
*/
|
||||
public List<TaskInstance> queryNeedFailoverTaskInstances(String host) {
|
||||
return taskInstanceMapper.queryByHostAndStatus(host,
|
||||
stateArray);
|
||||
stateArray);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1659,7 +1640,7 @@ public class ProcessService {
|
||||
* update process instance state by id
|
||||
*
|
||||
* @param processInstanceId processInstanceId
|
||||
* @param executionStatus executionStatus
|
||||
* @param executionStatus executionStatus
|
||||
* @return update process result
|
||||
*/
|
||||
public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) {
|
||||
@ -1696,7 +1677,7 @@ public class ProcessService {
|
||||
/**
|
||||
* find tenant code by resource name
|
||||
*
|
||||
* @param resName resource name
|
||||
* @param resName resource name
|
||||
* @param resourceType resource type
|
||||
* @return tenant code
|
||||
*/
|
||||
@ -1714,35 +1695,35 @@ public class ProcessService {
|
||||
*/
|
||||
public List<Schedule> selectAllByProcessDefineId(int[] ids) {
|
||||
return scheduleMapper.selectAllByProcessDefineArray(
|
||||
ids);
|
||||
ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* get dependency cycle by work process define id and scheduler fire time
|
||||
*
|
||||
* @param masterId masterId
|
||||
* @param masterId masterId
|
||||
* @param processDefinitionId processDefinitionId
|
||||
* @param scheduledFireTime the time the task schedule is expected to trigger
|
||||
* @param scheduledFireTime the time the task schedule is expected to trigger
|
||||
* @return CycleDependency
|
||||
* @throws Exception if error throws Exception
|
||||
*/
|
||||
public CycleDependency getCycleDependency(int masterId, int processDefinitionId, Date scheduledFireTime) throws Exception {
|
||||
List<CycleDependency> list = getCycleDependencies(masterId, new int[] {processDefinitionId}, scheduledFireTime);
|
||||
return list.size() > 0 ? list.get(0) : null;
|
||||
List<CycleDependency> list = getCycleDependencies(masterId, new int[]{processDefinitionId}, scheduledFireTime);
|
||||
return !list.isEmpty() ? list.get(0) : null;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* get dependency cycle list by work process define id list and scheduler fire time
|
||||
*
|
||||
* @param masterId masterId
|
||||
* @param ids ids
|
||||
* @param masterId masterId
|
||||
* @param ids ids
|
||||
* @param scheduledFireTime the time the task schedule is expected to trigger
|
||||
* @return CycleDependency list
|
||||
* @throws Exception if error throws Exception
|
||||
*/
|
||||
public List<CycleDependency> getCycleDependencies(int masterId, int[] ids, Date scheduledFireTime) throws Exception {
|
||||
List<CycleDependency> cycleDependencyList = new ArrayList<CycleDependency>();
|
||||
List<CycleDependency> cycleDependencyList = new ArrayList<>();
|
||||
if (null == ids || ids.length == 0) {
|
||||
logger.warn("ids[] is empty!is invalid!");
|
||||
return cycleDependencyList;
|
||||
@ -1769,14 +1750,10 @@ public class ProcessService {
|
||||
}
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
switch (cycleEnum) {
|
||||
/*case MINUTE:
|
||||
calendar.add(Calendar.MINUTE,-61);*/
|
||||
case HOUR:
|
||||
calendar.add(Calendar.HOUR, -25);
|
||||
break;
|
||||
case DAY:
|
||||
calendar.add(Calendar.DATE, -32);
|
||||
break;
|
||||
case WEEK:
|
||||
calendar.add(Calendar.DATE, -32);
|
||||
break;
|
||||
@ -1784,7 +1761,8 @@ public class ProcessService {
|
||||
calendar.add(Calendar.MONTH, -13);
|
||||
break;
|
||||
default:
|
||||
logger.warn("Dependent process definition's cycleEnum is {},not support!!", cycleEnum.name());
|
||||
String cycleName = cycleEnum.name();
|
||||
logger.warn("Dependent process definition's cycleEnum is {},not support!!", cycleName);
|
||||
continue;
|
||||
}
|
||||
Date start = calendar.getTime();
|
||||
@ -1794,7 +1772,7 @@ public class ProcessService {
|
||||
} else {
|
||||
list = CronUtils.getFireDateList(start, scheduledFireTime, depCronExpression);
|
||||
}
|
||||
if (list.size() >= 1) {
|
||||
if (!list.isEmpty()) {
|
||||
start = list.get(list.size() - 1);
|
||||
CycleDependency dependency = new CycleDependency(depSchedule.getProcessDefinitionId(), start, CronUtils.getExpirationTime(start, cycleEnum), cycleEnum);
|
||||
cycleDependencyList.add(dependency);
|
||||
@ -1813,8 +1791,8 @@ public class ProcessService {
|
||||
*/
|
||||
public ProcessInstance findLastSchedulerProcessInterval(int definitionId, DateInterval dateInterval) {
|
||||
return processInstanceMapper.queryLastSchedulerProcess(definitionId,
|
||||
dateInterval.getStartTime(),
|
||||
dateInterval.getEndTime());
|
||||
dateInterval.getStartTime(),
|
||||
dateInterval.getEndTime());
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1826,23 +1804,23 @@ public class ProcessService {
|
||||
*/
|
||||
public ProcessInstance findLastManualProcessInterval(int definitionId, DateInterval dateInterval) {
|
||||
return processInstanceMapper.queryLastManualProcess(definitionId,
|
||||
dateInterval.getStartTime(),
|
||||
dateInterval.getEndTime());
|
||||
dateInterval.getStartTime(),
|
||||
dateInterval.getEndTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* find last running process instance
|
||||
*
|
||||
* @param definitionId process definition id
|
||||
* @param startTime start time
|
||||
* @param endTime end time
|
||||
* @param startTime start time
|
||||
* @param endTime end time
|
||||
* @return process instance
|
||||
*/
|
||||
public ProcessInstance findLastRunningProcess(int definitionId, Date startTime, Date endTime) {
|
||||
return processInstanceMapper.queryLastRunningProcess(definitionId,
|
||||
startTime,
|
||||
endTime,
|
||||
stateArray);
|
||||
startTime,
|
||||
endTime,
|
||||
stateArray);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1867,6 +1845,7 @@ public class ProcessService {
|
||||
|
||||
/**
|
||||
* query project name and user name by processInstanceId.
|
||||
*
|
||||
* @param processInstanceId processInstanceId
|
||||
* @return projectName and userName
|
||||
*/
|
||||
@ -1934,35 +1913,32 @@ public class ProcessService {
|
||||
/**
|
||||
* list unauthorized udf function
|
||||
*
|
||||
* @param userId user id
|
||||
* @param userId user id
|
||||
* @param needChecks data source id array
|
||||
* @return unauthorized udf function list
|
||||
*/
|
||||
public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) {
|
||||
List<T> resultList = new ArrayList<T>();
|
||||
List<T> resultList = new ArrayList<>();
|
||||
|
||||
if (Objects.nonNull(needChecks) && needChecks.length > 0) {
|
||||
Set<T> originResSet = new HashSet<T>(Arrays.asList(needChecks));
|
||||
Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
|
||||
|
||||
switch (authorizationType) {
|
||||
case RESOURCE_FILE_ID:
|
||||
Set<Integer> authorizedResourceFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
|
||||
case UDF_FILE:
|
||||
Set<Integer> authorizedResourceFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(Resource::getId).collect(toSet());
|
||||
originResSet.removeAll(authorizedResourceFiles);
|
||||
break;
|
||||
case RESOURCE_FILE_NAME:
|
||||
Set<String> authorizedResources = resourceMapper.listAuthorizedResource(userId, needChecks).stream().map(t -> t.getFullName()).collect(toSet());
|
||||
Set<String> authorizedResources = resourceMapper.listAuthorizedResource(userId, needChecks).stream().map(Resource::getFullName).collect(toSet());
|
||||
originResSet.removeAll(authorizedResources);
|
||||
break;
|
||||
case UDF_FILE:
|
||||
Set<Integer> authorizedUdfFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
|
||||
originResSet.removeAll(authorizedUdfFiles);
|
||||
break;
|
||||
case DATASOURCE:
|
||||
Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
|
||||
Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet());
|
||||
originResSet.removeAll(authorizedDatasources);
|
||||
break;
|
||||
case UDF:
|
||||
Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
|
||||
Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet());
|
||||
originResSet.removeAll(authorizedUdfs);
|
||||
break;
|
||||
default:
|
||||
@ -2007,9 +1983,6 @@ public class ProcessService {
|
||||
|
||||
/**
|
||||
* format task app id in task instance
|
||||
*
|
||||
* @param taskInstance
|
||||
* @return
|
||||
*/
|
||||
public String formatTaskAppId(TaskInstance taskInstance) {
|
||||
ProcessDefinition definition = this.findProcessDefineById(taskInstance.getProcessDefinitionId());
|
||||
@ -2019,9 +1992,9 @@ public class ProcessService {
|
||||
return "";
|
||||
}
|
||||
return String.format("%s_%s_%s",
|
||||
definition.getId(),
|
||||
processInstanceById.getId(),
|
||||
taskInstance.getId());
|
||||
definition.getId(),
|
||||
processInstanceById.getId(),
|
||||
taskInstance.getId());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -14,8 +14,8 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.dolphinscheduler.service.quartz;
|
||||
|
||||
package org.apache.dolphinscheduler.service.quartz;
|
||||
|
||||
import org.apache.dolphinscheduler.common.Constants;
|
||||
import org.apache.dolphinscheduler.common.enums.CommandType;
|
||||
@ -25,6 +25,9 @@ import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
|
||||
import org.apache.dolphinscheduler.dao.entity.Schedule;
|
||||
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
|
||||
import org.apache.dolphinscheduler.service.process.ProcessService;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.quartz.Job;
|
||||
import org.quartz.JobDataMap;
|
||||
import org.quartz.JobExecutionContext;
|
||||
@ -34,8 +37,6 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* process schedule job
|
||||
*/
|
||||
@ -46,7 +47,7 @@ public class ProcessScheduleJob implements Job {
|
||||
*/
|
||||
private static final Logger logger = LoggerFactory.getLogger(ProcessScheduleJob.class);
|
||||
|
||||
public ProcessService getProcessService(){
|
||||
public ProcessService getProcessService() {
|
||||
return SpringApplicationContext.getBean(ProcessService.class);
|
||||
}
|
||||
|
||||
@ -66,10 +67,8 @@ public class ProcessScheduleJob implements Job {
|
||||
int projectId = dataMap.getInt(Constants.PROJECT_ID);
|
||||
int scheduleId = dataMap.getInt(Constants.SCHEDULE_ID);
|
||||
|
||||
|
||||
Date scheduledFireTime = context.getScheduledFireTime();
|
||||
|
||||
|
||||
Date fireTime = context.getFireTime();
|
||||
|
||||
logger.info("scheduled fire time :{}, fire time :{}, process id :{}", scheduledFireTime, fireTime, scheduleId);
|
||||
@ -82,11 +81,10 @@ public class ProcessScheduleJob implements Job {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ProcessDefinition processDefinition = getProcessService().findProcessDefineById(schedule.getProcessDefinitionId());
|
||||
// release state : online/offline
|
||||
ReleaseState releaseState = processDefinition.getReleaseState();
|
||||
if (processDefinition == null || releaseState == ReleaseState.OFFLINE) {
|
||||
if (releaseState == ReleaseState.OFFLINE) {
|
||||
logger.warn("process definition does not exist in db or offline,need not to create command, projectId:{}, processId:{}", projectId, scheduleId);
|
||||
return;
|
||||
}
|
||||
@ -107,7 +105,6 @@ public class ProcessScheduleJob implements Job {
|
||||
getProcessService().createCommand(command);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* delete job
|
||||
*/
|
||||
|
@ -14,15 +14,76 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.quartz;
|
||||
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_POSTGRESQL_DRIVER;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_CLASS;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_DATASOURCE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_ISCLUSTERED;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_TABLEPREFIX;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_USEPROPERTIES;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_INSTANCEID;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_INSTANCENAME;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_CLASS;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_THREADCOUNT;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_THREADPRIORITY;
|
||||
import static org.apache.dolphinscheduler.common.Constants.PROJECT_ID;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_ACQUIRETRIGGERSWITHINLOCK;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_CLUSTERCHECKININTERVAL;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_DATASOURCE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_INSTANCEID;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_INSTANCENAME;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_JOB_GROUP_PRIFIX;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_JOB_PRIFIX;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_MISFIRETHRESHOLD;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_PROPERTIES_PATH;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_TABLE_PREFIX;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_THREADCOUNT;
|
||||
import static org.apache.dolphinscheduler.common.Constants.QUARTZ_THREADPRIORITY;
|
||||
import static org.apache.dolphinscheduler.common.Constants.SCHEDULE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.SCHEDULE_ID;
|
||||
import static org.apache.dolphinscheduler.common.Constants.SPRING_DATASOURCE_DRIVER_CLASS_NAME;
|
||||
import static org.apache.dolphinscheduler.common.Constants.STRING_FALSE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.STRING_TRUE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.UNDERLINE;
|
||||
|
||||
import static org.quartz.CronScheduleBuilder.cronSchedule;
|
||||
import static org.quartz.JobBuilder.newJob;
|
||||
import static org.quartz.TriggerBuilder.newTrigger;
|
||||
|
||||
import org.apache.dolphinscheduler.common.utils.JSONUtils;
|
||||
import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
import org.apache.dolphinscheduler.dao.entity.Schedule;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
|
||||
import org.apache.commons.configuration.Configuration;
|
||||
import org.apache.commons.configuration.ConfigurationException;
|
||||
import org.apache.commons.configuration.PropertiesConfiguration;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.dolphinscheduler.common.utils.*;
|
||||
import org.apache.dolphinscheduler.dao.entity.Schedule;
|
||||
import org.quartz.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.concurrent.locks.ReadWriteLock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
import org.quartz.CronTrigger;
|
||||
import org.quartz.Job;
|
||||
import org.quartz.JobDetail;
|
||||
import org.quartz.JobKey;
|
||||
import org.quartz.Scheduler;
|
||||
import org.quartz.SchedulerException;
|
||||
import org.quartz.TriggerKey;
|
||||
import org.quartz.impl.StdSchedulerFactory;
|
||||
import org.quartz.impl.jdbcjobstore.JobStoreTX;
|
||||
import org.quartz.impl.jdbcjobstore.PostgreSQLDelegate;
|
||||
@ -32,300 +93,289 @@ import org.quartz.simpl.SimpleThreadPool;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.locks.ReadWriteLock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
import static org.apache.dolphinscheduler.common.Constants.*;
|
||||
import static org.quartz.CronScheduleBuilder.cronSchedule;
|
||||
import static org.quartz.JobBuilder.newJob;
|
||||
import static org.quartz.TriggerBuilder.newTrigger;
|
||||
|
||||
/**
|
||||
* single Quartz executors instance
|
||||
*/
|
||||
public class QuartzExecutors {
|
||||
|
||||
/**
|
||||
* logger of QuartzExecutors
|
||||
*/
|
||||
private static final Logger logger = LoggerFactory.getLogger(QuartzExecutors.class);
|
||||
/**
|
||||
* logger of QuartzExecutors
|
||||
*/
|
||||
private static final Logger logger = LoggerFactory.getLogger(QuartzExecutors.class);
|
||||
|
||||
/**
|
||||
* read write lock
|
||||
*/
|
||||
private final ReadWriteLock lock = new ReentrantReadWriteLock();
|
||||
/**
|
||||
* read write lock
|
||||
*/
|
||||
private final ReadWriteLock lock = new ReentrantReadWriteLock();
|
||||
|
||||
/**
|
||||
* A Scheduler maintains a registry of org.quartz.JobDetail and Trigger.
|
||||
*/
|
||||
private static Scheduler scheduler;
|
||||
/**
|
||||
* A Scheduler maintains a registry of org.quartz.JobDetail and Trigger.
|
||||
*/
|
||||
private static Scheduler scheduler;
|
||||
|
||||
/**
|
||||
* load conf
|
||||
*/
|
||||
private static Configuration conf;
|
||||
/**
|
||||
* load conf
|
||||
*/
|
||||
private static Configuration conf;
|
||||
|
||||
private static final class Holder {
|
||||
private static final QuartzExecutors instance = new QuartzExecutors();
|
||||
}
|
||||
|
||||
|
||||
private QuartzExecutors() {
|
||||
try {
|
||||
conf = new PropertiesConfiguration(QUARTZ_PROPERTIES_PATH);
|
||||
init();
|
||||
}catch (ConfigurationException e){
|
||||
logger.warn("not loaded quartz configuration file, will used default value",e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* thread safe and performance promote
|
||||
* @return instance of Quartz Executors
|
||||
*/
|
||||
public static QuartzExecutors getInstance() {
|
||||
return Holder.instance;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* init
|
||||
*
|
||||
* Returns a client-usable handle to a Scheduler.
|
||||
*/
|
||||
private void init() {
|
||||
try {
|
||||
StdSchedulerFactory schedulerFactory = new StdSchedulerFactory();
|
||||
Properties properties = new Properties();
|
||||
|
||||
String dataSourceDriverClass = org.apache.dolphinscheduler.dao.utils.PropertyUtils.getString(SPRING_DATASOURCE_DRIVER_CLASS_NAME);
|
||||
if (dataSourceDriverClass.equals(ORG_POSTGRESQL_DRIVER)){
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS,conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, PostgreSQLDelegate.class.getName()));
|
||||
} else {
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS,conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, StdJDBCDelegate.class.getName()));
|
||||
}
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCENAME, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCENAME, QUARTZ_INSTANCENAME));
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCEID, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCEID, QUARTZ_INSTANCEID));
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON,conf.getString(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON,STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_USEPROPERTIES,conf.getString(ORG_QUARTZ_JOBSTORE_USEPROPERTIES,STRING_FALSE));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_CLASS,conf.getString(ORG_QUARTZ_THREADPOOL_CLASS, SimpleThreadPool.class.getName()));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS,conf.getString(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS,STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADCOUNT,conf.getString(ORG_QUARTZ_THREADPOOL_THREADCOUNT, QUARTZ_THREADCOUNT));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADPRIORITY,conf.getString(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, QUARTZ_THREADPRIORITY));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_CLASS,conf.getString(ORG_QUARTZ_JOBSTORE_CLASS, JobStoreTX.class.getName()));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_TABLEPREFIX,conf.getString(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, QUARTZ_TABLE_PREFIX));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_ISCLUSTERED,conf.getString(ORG_QUARTZ_JOBSTORE_ISCLUSTERED,STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD,conf.getString(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, QUARTZ_MISFIRETHRESHOLD));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL,conf.getString(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, QUARTZ_CLUSTERCHECKININTERVAL));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK,conf.getString(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, QUARTZ_ACQUIRETRIGGERSWITHINLOCK));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DATASOURCE,conf.getString(ORG_QUARTZ_JOBSTORE_DATASOURCE, QUARTZ_DATASOURCE));
|
||||
properties.setProperty(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS,conf.getString(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS,DruidConnectionProvider.class.getName()));
|
||||
|
||||
schedulerFactory.initialize(properties);
|
||||
scheduler = schedulerFactory.getScheduler();
|
||||
|
||||
} catch (SchedulerException e) {
|
||||
logger.error(e.getMessage(),e);
|
||||
System.exit(1);
|
||||
private static final class Holder {
|
||||
private static final QuartzExecutors instance = new QuartzExecutors();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the scheduler has been started.
|
||||
*
|
||||
* @throws SchedulerException scheduler exception
|
||||
*/
|
||||
public void start() throws SchedulerException {
|
||||
if (!scheduler.isStarted()){
|
||||
scheduler.start();
|
||||
logger.info("Quartz service started" );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* stop all scheduled tasks
|
||||
*
|
||||
* Halts the Scheduler's firing of Triggers,
|
||||
* and cleans up all resources associated with the Scheduler.
|
||||
*
|
||||
* The scheduler cannot be re-started.
|
||||
* @throws SchedulerException scheduler exception
|
||||
*/
|
||||
public void shutdown() throws SchedulerException {
|
||||
if (!scheduler.isShutdown()) {
|
||||
// don't wait for the task to complete
|
||||
scheduler.shutdown();
|
||||
logger.info("Quartz service stopped, and halt all tasks");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* add task trigger , if this task already exists, return this task with updated trigger
|
||||
*
|
||||
* @param clazz job class name
|
||||
* @param jobName job name
|
||||
* @param jobGroupName job group name
|
||||
* @param startDate job start date
|
||||
* @param endDate job end date
|
||||
* @param cronExpression cron expression
|
||||
* @param jobDataMap job parameters data map
|
||||
*/
|
||||
public void addJob(Class<? extends Job> clazz,String jobName,String jobGroupName,Date startDate, Date endDate,
|
||||
String cronExpression,
|
||||
Map<String, Object> jobDataMap) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
|
||||
JobKey jobKey = new JobKey(jobName, jobGroupName);
|
||||
JobDetail jobDetail;
|
||||
//add a task (if this task already exists, return this task directly)
|
||||
if (scheduler.checkExists(jobKey)) {
|
||||
|
||||
jobDetail = scheduler.getJobDetail(jobKey);
|
||||
if (jobDataMap != null) {
|
||||
jobDetail.getJobDataMap().putAll(jobDataMap);
|
||||
private QuartzExecutors() {
|
||||
try {
|
||||
conf = new PropertiesConfiguration(QUARTZ_PROPERTIES_PATH);
|
||||
init();
|
||||
} catch (ConfigurationException e) {
|
||||
logger.warn("not loaded quartz configuration file, will used default value", e);
|
||||
}
|
||||
} else {
|
||||
jobDetail = newJob(clazz).withIdentity(jobKey).build();
|
||||
}
|
||||
|
||||
if (jobDataMap != null) {
|
||||
jobDetail.getJobDataMap().putAll(jobDataMap);
|
||||
/**
|
||||
* thread safe and performance promote
|
||||
*
|
||||
* @return instance of Quartz Executors
|
||||
*/
|
||||
public static QuartzExecutors getInstance() {
|
||||
return Holder.instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* init
|
||||
* <p>
|
||||
* Returns a client-usable handle to a Scheduler.
|
||||
*/
|
||||
private void init() {
|
||||
try {
|
||||
StdSchedulerFactory schedulerFactory = new StdSchedulerFactory();
|
||||
Properties properties = new Properties();
|
||||
|
||||
String dataSourceDriverClass = org.apache.dolphinscheduler.dao.utils.PropertyUtils.getString(SPRING_DATASOURCE_DRIVER_CLASS_NAME);
|
||||
if (dataSourceDriverClass.equals(ORG_POSTGRESQL_DRIVER)) {
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, PostgreSQLDelegate.class.getName()));
|
||||
} else {
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, StdJDBCDelegate.class.getName()));
|
||||
}
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCENAME, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCENAME, QUARTZ_INSTANCENAME));
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCEID, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCEID, QUARTZ_INSTANCEID));
|
||||
properties.setProperty(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON, conf.getString(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON, STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_USEPROPERTIES, conf.getString(ORG_QUARTZ_JOBSTORE_USEPROPERTIES, STRING_FALSE));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_CLASS, conf.getString(ORG_QUARTZ_THREADPOOL_CLASS, SimpleThreadPool.class.getName()));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS, conf.getString(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS, STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADCOUNT, conf.getString(ORG_QUARTZ_THREADPOOL_THREADCOUNT, QUARTZ_THREADCOUNT));
|
||||
properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, conf.getString(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, QUARTZ_THREADPRIORITY));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_CLASS, conf.getString(ORG_QUARTZ_JOBSTORE_CLASS, JobStoreTX.class.getName()));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, conf.getString(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, QUARTZ_TABLE_PREFIX));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_ISCLUSTERED, conf.getString(ORG_QUARTZ_JOBSTORE_ISCLUSTERED, STRING_TRUE));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, conf.getString(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, QUARTZ_MISFIRETHRESHOLD));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, conf.getString(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, QUARTZ_CLUSTERCHECKININTERVAL));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, conf.getString(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, QUARTZ_ACQUIRETRIGGERSWITHINLOCK));
|
||||
properties.setProperty(ORG_QUARTZ_JOBSTORE_DATASOURCE, conf.getString(ORG_QUARTZ_JOBSTORE_DATASOURCE, QUARTZ_DATASOURCE));
|
||||
properties.setProperty(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS, conf.getString(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS, DruidConnectionProvider.class.getName()));
|
||||
|
||||
schedulerFactory.initialize(properties);
|
||||
scheduler = schedulerFactory.getScheduler();
|
||||
|
||||
} catch (SchedulerException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
System.exit(1);
|
||||
}
|
||||
|
||||
scheduler.addJob(jobDetail, false, true);
|
||||
|
||||
logger.info("Add job, job name: {}, group name: {}",
|
||||
jobName, jobGroupName);
|
||||
}
|
||||
|
||||
TriggerKey triggerKey = new TriggerKey(jobName, jobGroupName);
|
||||
/**
|
||||
* Instructs the Scheduler that upon a mis-fire
|
||||
* situation, the CronTrigger wants to have it's
|
||||
* next-fire-time updated to the next time in the schedule after the
|
||||
* current time (taking into account any associated Calendar),
|
||||
* but it does not want to be fired now.
|
||||
*/
|
||||
CronTrigger cronTrigger = newTrigger().withIdentity(triggerKey).startAt(startDate).endAt(endDate)
|
||||
.withSchedule(cronSchedule(cronExpression).withMisfireHandlingInstructionDoNothing())
|
||||
.forJob(jobDetail).build();
|
||||
|
||||
if (scheduler.checkExists(triggerKey)) {
|
||||
// updateProcessInstance scheduler trigger when scheduler cycle changes
|
||||
CronTrigger oldCronTrigger = (CronTrigger) scheduler.getTrigger(triggerKey);
|
||||
String oldCronExpression = oldCronTrigger.getCronExpression();
|
||||
|
||||
if (!StringUtils.equalsIgnoreCase(cronExpression,oldCronExpression)) {
|
||||
// reschedule job trigger
|
||||
scheduler.rescheduleJob(triggerKey, cronTrigger);
|
||||
logger.info("reschedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
|
||||
jobName, jobGroupName, cronExpression, startDate, endDate);
|
||||
}
|
||||
} else {
|
||||
scheduler.scheduleJob(cronTrigger);
|
||||
logger.info("schedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
|
||||
jobName, jobGroupName, cronExpression, startDate, endDate);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("add job failed", e);
|
||||
throw new RuntimeException("add job failed", e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* delete job
|
||||
*
|
||||
* @param jobName job name
|
||||
* @param jobGroupName job group name
|
||||
* @return true if the Job was found and deleted.
|
||||
*/
|
||||
public boolean deleteJob(String jobName, String jobGroupName) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
JobKey jobKey = new JobKey(jobName,jobGroupName);
|
||||
if(scheduler.checkExists(jobKey)){
|
||||
logger.info("try to delete job, job name: {}, job group name: {},", jobName, jobGroupName);
|
||||
return scheduler.deleteJob(jobKey);
|
||||
}else {
|
||||
return true;
|
||||
}
|
||||
|
||||
} catch (SchedulerException e) {
|
||||
logger.error("delete job : {} failed",jobName, e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
/**
|
||||
* Whether the scheduler has been started.
|
||||
*
|
||||
* @throws SchedulerException scheduler exception
|
||||
*/
|
||||
public void start() throws SchedulerException {
|
||||
if (!scheduler.isStarted()) {
|
||||
scheduler.start();
|
||||
logger.info("Quartz service started");
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* delete all jobs in job group
|
||||
*
|
||||
* @param jobGroupName job group name
|
||||
*
|
||||
* @return true if all of the Jobs were found and deleted, false if
|
||||
* one or more were not deleted.
|
||||
*/
|
||||
public boolean deleteAllJobs(String jobGroupName) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
logger.info("try to delete all jobs in job group: {}", jobGroupName);
|
||||
List<JobKey> jobKeys = new ArrayList<>();
|
||||
jobKeys.addAll(scheduler.getJobKeys(GroupMatcher.groupEndsWith(jobGroupName)));
|
||||
|
||||
return scheduler.deleteJobs(jobKeys);
|
||||
} catch (SchedulerException e) {
|
||||
logger.error("delete all jobs in job group: {} failed",jobGroupName, e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
/**
|
||||
* stop all scheduled tasks
|
||||
* <p>
|
||||
* Halts the Scheduler's firing of Triggers,
|
||||
* and cleans up all resources associated with the Scheduler.
|
||||
* <p>
|
||||
* The scheduler cannot be re-started.
|
||||
*
|
||||
* @throws SchedulerException scheduler exception
|
||||
*/
|
||||
public void shutdown() throws SchedulerException {
|
||||
if (!scheduler.isShutdown()) {
|
||||
// don't wait for the task to complete
|
||||
scheduler.shutdown();
|
||||
logger.info("Quartz service stopped, and halt all tasks");
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* build job name
|
||||
* @param processId process id
|
||||
* @return job name
|
||||
*/
|
||||
public static String buildJobName(int processId) {
|
||||
StringBuilder sb = new StringBuilder(30);
|
||||
sb.append(QUARTZ_JOB_PRIFIX).append(UNDERLINE).append(processId);
|
||||
return sb.toString();
|
||||
}
|
||||
/**
|
||||
* add task trigger , if this task already exists, return this task with updated trigger
|
||||
*
|
||||
* @param clazz job class name
|
||||
* @param jobName job name
|
||||
* @param jobGroupName job group name
|
||||
* @param startDate job start date
|
||||
* @param endDate job end date
|
||||
* @param cronExpression cron expression
|
||||
* @param jobDataMap job parameters data map
|
||||
*/
|
||||
public void addJob(Class<? extends Job> clazz, String jobName, String jobGroupName, Date startDate, Date endDate,
|
||||
String cronExpression,
|
||||
Map<String, Object> jobDataMap) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
|
||||
/**
|
||||
* build job group name
|
||||
* @param projectId project id
|
||||
* @return job group name
|
||||
*/
|
||||
public static String buildJobGroupName(int projectId) {
|
||||
StringBuilder sb = new StringBuilder(30);
|
||||
sb.append(QUARTZ_JOB_GROUP_PRIFIX).append(UNDERLINE).append(projectId);
|
||||
return sb.toString();
|
||||
}
|
||||
JobKey jobKey = new JobKey(jobName, jobGroupName);
|
||||
JobDetail jobDetail;
|
||||
//add a task (if this task already exists, return this task directly)
|
||||
if (scheduler.checkExists(jobKey)) {
|
||||
|
||||
/**
|
||||
* add params to map
|
||||
*
|
||||
* @param projectId project id
|
||||
* @param scheduleId schedule id
|
||||
* @param schedule schedule
|
||||
* @return data map
|
||||
*/
|
||||
public static Map<String, Object> buildDataMap(int projectId, int scheduleId, Schedule schedule) {
|
||||
Map<String, Object> dataMap = new HashMap<>(3);
|
||||
dataMap.put(PROJECT_ID, projectId);
|
||||
dataMap.put(SCHEDULE_ID, scheduleId);
|
||||
dataMap.put(SCHEDULE, JSONUtils.toJsonString(schedule));
|
||||
jobDetail = scheduler.getJobDetail(jobKey);
|
||||
if (jobDataMap != null) {
|
||||
jobDetail.getJobDataMap().putAll(jobDataMap);
|
||||
}
|
||||
} else {
|
||||
jobDetail = newJob(clazz).withIdentity(jobKey).build();
|
||||
|
||||
return dataMap;
|
||||
}
|
||||
if (jobDataMap != null) {
|
||||
jobDetail.getJobDataMap().putAll(jobDataMap);
|
||||
}
|
||||
|
||||
scheduler.addJob(jobDetail, false, true);
|
||||
|
||||
logger.info("Add job, job name: {}, group name: {}",
|
||||
jobName, jobGroupName);
|
||||
}
|
||||
|
||||
TriggerKey triggerKey = new TriggerKey(jobName, jobGroupName);
|
||||
/**
|
||||
* Instructs the Scheduler that upon a mis-fire
|
||||
* situation, the CronTrigger wants to have it's
|
||||
* next-fire-time updated to the next time in the schedule after the
|
||||
* current time (taking into account any associated Calendar),
|
||||
* but it does not want to be fired now.
|
||||
*/
|
||||
CronTrigger cronTrigger = newTrigger().withIdentity(triggerKey).startAt(startDate).endAt(endDate)
|
||||
.withSchedule(cronSchedule(cronExpression).withMisfireHandlingInstructionDoNothing())
|
||||
.forJob(jobDetail).build();
|
||||
|
||||
if (scheduler.checkExists(triggerKey)) {
|
||||
// updateProcessInstance scheduler trigger when scheduler cycle changes
|
||||
CronTrigger oldCronTrigger = (CronTrigger) scheduler.getTrigger(triggerKey);
|
||||
String oldCronExpression = oldCronTrigger.getCronExpression();
|
||||
|
||||
if (!StringUtils.equalsIgnoreCase(cronExpression, oldCronExpression)) {
|
||||
// reschedule job trigger
|
||||
scheduler.rescheduleJob(triggerKey, cronTrigger);
|
||||
logger.info("reschedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
|
||||
jobName, jobGroupName, cronExpression, startDate, endDate);
|
||||
}
|
||||
} else {
|
||||
scheduler.scheduleJob(cronTrigger);
|
||||
logger.info("schedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
|
||||
jobName, jobGroupName, cronExpression, startDate, endDate);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException("add job failed", e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* delete job
|
||||
*
|
||||
* @param jobName job name
|
||||
* @param jobGroupName job group name
|
||||
* @return true if the Job was found and deleted.
|
||||
*/
|
||||
public boolean deleteJob(String jobName, String jobGroupName) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
JobKey jobKey = new JobKey(jobName, jobGroupName);
|
||||
if (scheduler.checkExists(jobKey)) {
|
||||
logger.info("try to delete job, job name: {}, job group name: {},", jobName, jobGroupName);
|
||||
return scheduler.deleteJob(jobKey);
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
|
||||
} catch (SchedulerException e) {
|
||||
logger.error("delete job : {} failed", jobName, e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* delete all jobs in job group
|
||||
*
|
||||
* @param jobGroupName job group name
|
||||
* @return true if all of the Jobs were found and deleted, false if
|
||||
* one or more were not deleted.
|
||||
*/
|
||||
public boolean deleteAllJobs(String jobGroupName) {
|
||||
lock.writeLock().lock();
|
||||
try {
|
||||
logger.info("try to delete all jobs in job group: {}", jobGroupName);
|
||||
List<JobKey> jobKeys = new ArrayList<>();
|
||||
jobKeys.addAll(scheduler.getJobKeys(GroupMatcher.groupEndsWith(jobGroupName)));
|
||||
|
||||
return scheduler.deleteJobs(jobKeys);
|
||||
} catch (SchedulerException e) {
|
||||
logger.error("delete all jobs in job group: {} failed", jobGroupName, e);
|
||||
} finally {
|
||||
lock.writeLock().unlock();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* build job name
|
||||
*
|
||||
* @param processId process id
|
||||
* @return job name
|
||||
*/
|
||||
public static String buildJobName(int processId) {
|
||||
StringBuilder sb = new StringBuilder(30);
|
||||
sb.append(QUARTZ_JOB_PRIFIX).append(UNDERLINE).append(processId);
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* build job group name
|
||||
*
|
||||
* @param projectId project id
|
||||
* @return job group name
|
||||
*/
|
||||
public static String buildJobGroupName(int projectId) {
|
||||
StringBuilder sb = new StringBuilder(30);
|
||||
sb.append(QUARTZ_JOB_GROUP_PRIFIX).append(UNDERLINE).append(projectId);
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* add params to map
|
||||
*
|
||||
* @param projectId project id
|
||||
* @param scheduleId schedule id
|
||||
* @param schedule schedule
|
||||
* @return data map
|
||||
*/
|
||||
public static Map<String, Object> buildDataMap(int projectId, int scheduleId, Schedule schedule) {
|
||||
Map<String, Object> dataMap = new HashMap<>(3);
|
||||
dataMap.put(PROJECT_ID, projectId);
|
||||
dataMap.put(SCHEDULE_ID, scheduleId);
|
||||
dataMap.put(SCHEDULE, JSONUtils.toJsonString(schedule));
|
||||
|
||||
return dataMap;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -14,159 +14,177 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.quartz.cron;
|
||||
|
||||
import org.apache.dolphinscheduler.common.enums.CycleEnum;
|
||||
|
||||
import com.cronutils.model.Cron;
|
||||
import com.cronutils.model.field.CronField;
|
||||
import com.cronutils.model.field.CronFieldName;
|
||||
import com.cronutils.model.field.expression.*;
|
||||
import org.apache.dolphinscheduler.common.enums.CycleEnum;
|
||||
import com.cronutils.model.field.expression.Always;
|
||||
import com.cronutils.model.field.expression.And;
|
||||
import com.cronutils.model.field.expression.Between;
|
||||
import com.cronutils.model.field.expression.Every;
|
||||
import com.cronutils.model.field.expression.FieldExpression;
|
||||
import com.cronutils.model.field.expression.On;
|
||||
|
||||
/**
|
||||
* Cycle
|
||||
*/
|
||||
public abstract class AbstractCycle {
|
||||
|
||||
protected Cron cron;
|
||||
protected Cron cron;
|
||||
|
||||
protected CronField minField;
|
||||
protected CronField hourField;
|
||||
protected CronField dayOfMonthField;
|
||||
protected CronField dayOfWeekField;
|
||||
protected CronField monthField;
|
||||
protected CronField yearField;
|
||||
protected CronField minField;
|
||||
protected CronField hourField;
|
||||
protected CronField dayOfMonthField;
|
||||
protected CronField dayOfWeekField;
|
||||
protected CronField monthField;
|
||||
protected CronField yearField;
|
||||
|
||||
public CycleLinks addCycle(AbstractCycle cycle) {
|
||||
return new CycleLinks(this.cron).addCycle(this).addCycle(cycle);
|
||||
}
|
||||
|
||||
/**
|
||||
* cycle constructor
|
||||
* @param cron cron
|
||||
*/
|
||||
public AbstractCycle(Cron cron) {
|
||||
if (cron == null) {
|
||||
throw new IllegalArgumentException("cron must not be null!");
|
||||
public CycleLinks addCycle(AbstractCycle cycle) {
|
||||
return new CycleLinks(this.cron).addCycle(this).addCycle(cycle);
|
||||
}
|
||||
|
||||
this.cron = cron;
|
||||
this.minField = cron.retrieve(CronFieldName.MINUTE);
|
||||
this.hourField = cron.retrieve(CronFieldName.HOUR);
|
||||
this.dayOfMonthField = cron.retrieve(CronFieldName.DAY_OF_MONTH);
|
||||
this.dayOfWeekField = cron.retrieve(CronFieldName.DAY_OF_WEEK);
|
||||
this.monthField = cron.retrieve(CronFieldName.MONTH);
|
||||
this.yearField = cron.retrieve(CronFieldName.YEAR);
|
||||
}
|
||||
/**
|
||||
* cycle constructor
|
||||
*
|
||||
* @param cron cron
|
||||
*/
|
||||
protected AbstractCycle(Cron cron) {
|
||||
if (cron == null) {
|
||||
throw new IllegalArgumentException("cron must not be null!");
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the minute field has a value
|
||||
* @return if minute field has a value return true,else return false
|
||||
*/
|
||||
protected boolean minFiledIsSetAll(){
|
||||
FieldExpression minFieldExpression = minField.getExpression();
|
||||
return (minFieldExpression instanceof Every || minFieldExpression instanceof Always
|
||||
|| minFieldExpression instanceof Between || minFieldExpression instanceof And
|
||||
|| minFieldExpression instanceof On);
|
||||
}
|
||||
this.cron = cron;
|
||||
this.minField = cron.retrieve(CronFieldName.MINUTE);
|
||||
this.hourField = cron.retrieve(CronFieldName.HOUR);
|
||||
this.dayOfMonthField = cron.retrieve(CronFieldName.DAY_OF_MONTH);
|
||||
this.dayOfWeekField = cron.retrieve(CronFieldName.DAY_OF_WEEK);
|
||||
this.monthField = cron.retrieve(CronFieldName.MONTH);
|
||||
this.yearField = cron.retrieve(CronFieldName.YEAR);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the minute field has a value
|
||||
*
|
||||
* @return if minute field has a value return true,else return false
|
||||
*/
|
||||
protected boolean minFiledIsSetAll() {
|
||||
FieldExpression minFieldExpression = minField.getExpression();
|
||||
return (minFieldExpression instanceof Every || minFieldExpression instanceof Always
|
||||
|| minFieldExpression instanceof Between || minFieldExpression instanceof And
|
||||
|| minFieldExpression instanceof On);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the minute field has a value of every or always
|
||||
* @return if minute field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean minFiledIsEvery(){
|
||||
FieldExpression minFieldExpression = minField.getExpression();
|
||||
return (minFieldExpression instanceof Every || minFieldExpression instanceof Always);
|
||||
}
|
||||
/**
|
||||
* whether the minute field has a value of every or always
|
||||
*
|
||||
* @return if minute field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean minFiledIsEvery() {
|
||||
FieldExpression minFieldExpression = minField.getExpression();
|
||||
return (minFieldExpression instanceof Every || minFieldExpression instanceof Always);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the hour field has a value
|
||||
* @return if hour field has a value return true,else return false
|
||||
*/
|
||||
protected boolean hourFiledIsSetAll(){
|
||||
FieldExpression hourFieldExpression = hourField.getExpression();
|
||||
return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always
|
||||
|| hourFieldExpression instanceof Between || hourFieldExpression instanceof And
|
||||
|| hourFieldExpression instanceof On);
|
||||
}
|
||||
/**
|
||||
* whether the hour field has a value
|
||||
*
|
||||
* @return if hour field has a value return true,else return false
|
||||
*/
|
||||
protected boolean hourFiledIsSetAll() {
|
||||
FieldExpression hourFieldExpression = hourField.getExpression();
|
||||
return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always
|
||||
|| hourFieldExpression instanceof Between || hourFieldExpression instanceof And
|
||||
|| hourFieldExpression instanceof On);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the hour field has a value of every or always
|
||||
* @return if hour field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean hourFiledIsEvery(){
|
||||
FieldExpression hourFieldExpression = hourField.getExpression();
|
||||
return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always);
|
||||
}
|
||||
/**
|
||||
* whether the hour field has a value of every or always
|
||||
*
|
||||
* @return if hour field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean hourFiledIsEvery() {
|
||||
FieldExpression hourFieldExpression = hourField.getExpression();
|
||||
return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the day Of month field has a value
|
||||
* @return if day Of month field has a value return true,else return false
|
||||
*/
|
||||
protected boolean dayOfMonthFieldIsSetAll(){
|
||||
return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always
|
||||
|| dayOfMonthField.getExpression() instanceof Between || dayOfMonthField.getExpression() instanceof And
|
||||
|| dayOfMonthField.getExpression() instanceof On);
|
||||
}
|
||||
/**
|
||||
* whether the day Of month field has a value
|
||||
*
|
||||
* @return if day Of month field has a value return true,else return false
|
||||
*/
|
||||
protected boolean dayOfMonthFieldIsSetAll() {
|
||||
return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always
|
||||
|| dayOfMonthField.getExpression() instanceof Between || dayOfMonthField.getExpression() instanceof And
|
||||
|| dayOfMonthField.getExpression() instanceof On);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the day Of Month field has a value of every or always
|
||||
*
|
||||
* @return if day Of Month field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean dayOfMonthFieldIsEvery() {
|
||||
return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the day Of Month field has a value of every or always
|
||||
* @return if day Of Month field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean dayOfMonthFieldIsEvery(){
|
||||
return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always);
|
||||
}
|
||||
/**
|
||||
* whether month field has a value
|
||||
*
|
||||
* @return if month field has a value return true,else return false
|
||||
*/
|
||||
protected boolean monthFieldIsSetAll() {
|
||||
FieldExpression monthFieldExpression = monthField.getExpression();
|
||||
return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always
|
||||
|| monthFieldExpression instanceof Between || monthFieldExpression instanceof And
|
||||
|| monthFieldExpression instanceof On);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether month field has a value
|
||||
* @return if month field has a value return true,else return false
|
||||
*/
|
||||
protected boolean monthFieldIsSetAll(){
|
||||
FieldExpression monthFieldExpression = monthField.getExpression();
|
||||
return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always
|
||||
|| monthFieldExpression instanceof Between || monthFieldExpression instanceof And
|
||||
|| monthFieldExpression instanceof On);
|
||||
}
|
||||
/**
|
||||
* whether the month field has a value of every or always
|
||||
*
|
||||
* @return if month field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean monthFieldIsEvery() {
|
||||
FieldExpression monthFieldExpression = monthField.getExpression();
|
||||
return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the month field has a value of every or always
|
||||
* @return if month field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean monthFieldIsEvery(){
|
||||
FieldExpression monthFieldExpression = monthField.getExpression();
|
||||
return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always);
|
||||
}
|
||||
/**
|
||||
* whether the day Of week field has a value
|
||||
*
|
||||
* @return if day Of week field has a value return true,else return false
|
||||
*/
|
||||
protected boolean dayofWeekFieldIsSetAll() {
|
||||
FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
|
||||
return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always
|
||||
|| dayOfWeekFieldExpression instanceof Between || dayOfWeekFieldExpression instanceof And
|
||||
|| dayOfWeekFieldExpression instanceof On);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the day Of week field has a value
|
||||
* @return if day Of week field has a value return true,else return false
|
||||
*/
|
||||
protected boolean dayofWeekFieldIsSetAll(){
|
||||
FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
|
||||
return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always
|
||||
|| dayOfWeekFieldExpression instanceof Between || dayOfWeekFieldExpression instanceof And
|
||||
|| dayOfWeekFieldExpression instanceof On);
|
||||
}
|
||||
/**
|
||||
* whether the day Of week field has a value of every or always
|
||||
*
|
||||
* @return if day Of week field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean dayofWeekFieldIsEvery() {
|
||||
FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
|
||||
return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always);
|
||||
}
|
||||
|
||||
/**
|
||||
* whether the day Of week field has a value of every or always
|
||||
* @return if day Of week field has a value of every or always return true,else return false
|
||||
*/
|
||||
protected boolean dayofWeekFieldIsEvery(){
|
||||
FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
|
||||
return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always);
|
||||
}
|
||||
/**
|
||||
* get cycle enum
|
||||
*
|
||||
* @return CycleEnum
|
||||
*/
|
||||
protected abstract CycleEnum getCycle();
|
||||
|
||||
/**
|
||||
* get cycle enum
|
||||
* @return CycleEnum
|
||||
*/
|
||||
protected abstract CycleEnum getCycle();
|
||||
|
||||
/**
|
||||
* get mini level cycle enum
|
||||
* @return CycleEnum
|
||||
*/
|
||||
protected abstract CycleEnum getMiniCycle();
|
||||
/**
|
||||
* get mini level cycle enum
|
||||
*
|
||||
* @return CycleEnum
|
||||
*/
|
||||
protected abstract CycleEnum getMiniCycle();
|
||||
}
|
||||
|
@ -14,322 +14,329 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.zk;
|
||||
|
||||
import org.apache.curator.framework.recipes.locks.InterProcessMutex;
|
||||
import static org.apache.dolphinscheduler.common.Constants.ADD_ZK_OP;
|
||||
import static org.apache.dolphinscheduler.common.Constants.COLON;
|
||||
import static org.apache.dolphinscheduler.common.Constants.DELETE_ZK_OP;
|
||||
import static org.apache.dolphinscheduler.common.Constants.DIVISION_STRING;
|
||||
import static org.apache.dolphinscheduler.common.Constants.MASTER_PREFIX;
|
||||
import static org.apache.dolphinscheduler.common.Constants.SINGLE_SLASH;
|
||||
import static org.apache.dolphinscheduler.common.Constants.UNDERLINE;
|
||||
import static org.apache.dolphinscheduler.common.Constants.WORKER_PREFIX;
|
||||
|
||||
import org.apache.dolphinscheduler.common.Constants;
|
||||
import org.apache.dolphinscheduler.common.enums.ZKNodeType;
|
||||
import org.apache.dolphinscheduler.common.model.Server;
|
||||
import org.apache.dolphinscheduler.common.utils.ResInfo;
|
||||
import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
|
||||
import org.apache.curator.framework.recipes.locks.InterProcessMutex;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import static org.apache.dolphinscheduler.common.Constants.*;
|
||||
|
||||
/**
|
||||
* abstract zookeeper client
|
||||
*/
|
||||
@Component
|
||||
public abstract class AbstractZKClient extends ZookeeperCachedOperator {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(AbstractZKClient.class);
|
||||
private static final Logger logger = LoggerFactory.getLogger(AbstractZKClient.class);
|
||||
|
||||
/**
|
||||
* remove dead server by host
|
||||
*
|
||||
* @param host host
|
||||
* @param serverType serverType
|
||||
*/
|
||||
public void removeDeadServerByHost(String host, String serverType) {
|
||||
List<String> deadServers = super.getChildrenKeys(getDeadZNodeParentPath());
|
||||
for (String serverPath : deadServers) {
|
||||
if (serverPath.startsWith(serverType + UNDERLINE + host)) {
|
||||
String server = getDeadZNodeParentPath() + SINGLE_SLASH + serverPath;
|
||||
super.remove(server);
|
||||
logger.info("{} server {} deleted from zk dead server path success", serverType, host);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* remove dead server by host
|
||||
* @param host host
|
||||
* @param serverType serverType
|
||||
* @throws Exception
|
||||
*/
|
||||
public void removeDeadServerByHost(String host, String serverType) throws Exception {
|
||||
List<String> deadServers = super.getChildrenKeys(getDeadZNodeParentPath());
|
||||
for(String serverPath : deadServers){
|
||||
if(serverPath.startsWith(serverType+UNDERLINE+host)){
|
||||
String server = getDeadZNodeParentPath() + SINGLE_SLASH + serverPath;
|
||||
super.remove(server);
|
||||
logger.info("{} server {} deleted from zk dead server path success" , serverType , host);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* opType(add): if find dead server , then add to zk deadServerPath
|
||||
* opType(delete): delete path from zk
|
||||
*
|
||||
* @param zNode node path
|
||||
* @param zkNodeType master or worker
|
||||
* @param opType delete or add
|
||||
*/
|
||||
public void handleDeadServer(String zNode, ZKNodeType zkNodeType, String opType) {
|
||||
String host = getHostByEventDataPath(zNode);
|
||||
String type = (zkNodeType == ZKNodeType.MASTER) ? MASTER_PREFIX : WORKER_PREFIX;
|
||||
|
||||
//check server restart, if restart , dead server path in zk should be delete
|
||||
if (opType.equals(DELETE_ZK_OP)) {
|
||||
removeDeadServerByHost(host, type);
|
||||
|
||||
/**
|
||||
* opType(add): if find dead server , then add to zk deadServerPath
|
||||
* opType(delete): delete path from zk
|
||||
*
|
||||
* @param zNode node path
|
||||
* @param zkNodeType master or worker
|
||||
* @param opType delete or add
|
||||
* @throws Exception errors
|
||||
*/
|
||||
public void handleDeadServer(String zNode, ZKNodeType zkNodeType, String opType) throws Exception {
|
||||
String host = getHostByEventDataPath(zNode);
|
||||
String type = (zkNodeType == ZKNodeType.MASTER) ? MASTER_PREFIX : WORKER_PREFIX;
|
||||
} else if (opType.equals(ADD_ZK_OP)) {
|
||||
String deadServerPath = getDeadZNodeParentPath() + SINGLE_SLASH + type + UNDERLINE + host;
|
||||
if (!super.isExisted(deadServerPath)) {
|
||||
//add dead server info to zk dead server path : /dead-servers/
|
||||
|
||||
//check server restart, if restart , dead server path in zk should be delete
|
||||
if(opType.equals(DELETE_ZK_OP)){
|
||||
removeDeadServerByHost(host, type);
|
||||
super.persist(deadServerPath, (type + UNDERLINE + host));
|
||||
|
||||
}else if(opType.equals(ADD_ZK_OP)){
|
||||
String deadServerPath = getDeadZNodeParentPath() + SINGLE_SLASH + type + UNDERLINE + host;
|
||||
if(!super.isExisted(deadServerPath)){
|
||||
//add dead server info to zk dead server path : /dead-servers/
|
||||
logger.info("{} server dead , and {} added to zk dead server path success",
|
||||
zkNodeType, zNode);
|
||||
}
|
||||
}
|
||||
|
||||
super.persist(deadServerPath,(type + UNDERLINE + host));
|
||||
}
|
||||
|
||||
logger.info("{} server dead , and {} added to zk dead server path success" ,
|
||||
zkNodeType.toString(), zNode);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* get active master num
|
||||
*
|
||||
* @return active master number
|
||||
*/
|
||||
public int getActiveMasterNum() {
|
||||
List<String> childrenList = new ArrayList<>();
|
||||
try {
|
||||
// read master node parent path from conf
|
||||
if (super.isExisted(getZNodeParentPath(ZKNodeType.MASTER))) {
|
||||
childrenList = super.getChildrenKeys(getZNodeParentPath(ZKNodeType.MASTER));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("getActiveMasterNum error", e);
|
||||
}
|
||||
return childrenList.size();
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* @return zookeeper quorum
|
||||
*/
|
||||
public String getZookeeperQuorum() {
|
||||
return getZookeeperConfig().getServerList();
|
||||
}
|
||||
|
||||
/**
|
||||
* get active master num
|
||||
* @return active master number
|
||||
*/
|
||||
public int getActiveMasterNum(){
|
||||
List<String> childrenList = new ArrayList<>();
|
||||
try {
|
||||
// read master node parent path from conf
|
||||
if(super.isExisted(getZNodeParentPath(ZKNodeType.MASTER))){
|
||||
childrenList = super.getChildrenKeys(getZNodeParentPath(ZKNodeType.MASTER));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("getActiveMasterNum error",e);
|
||||
}
|
||||
return childrenList.size();
|
||||
}
|
||||
/**
|
||||
* get server list.
|
||||
*
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return server list
|
||||
*/
|
||||
public List<Server> getServersList(ZKNodeType zkNodeType) {
|
||||
Map<String, String> masterMap = getServerMaps(zkNodeType);
|
||||
String parentPath = getZNodeParentPath(zkNodeType);
|
||||
|
||||
/**
|
||||
*
|
||||
* @return zookeeper quorum
|
||||
*/
|
||||
public String getZookeeperQuorum(){
|
||||
return getZookeeperConfig().getServerList();
|
||||
}
|
||||
List<Server> masterServers = new ArrayList<>();
|
||||
for (Map.Entry<String, String> entry : masterMap.entrySet()) {
|
||||
Server masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
|
||||
if (masterServer == null) {
|
||||
continue;
|
||||
}
|
||||
String key = entry.getKey();
|
||||
masterServer.setZkDirectory(parentPath + "/" + key);
|
||||
//set host and port
|
||||
String[] hostAndPort = key.split(COLON);
|
||||
String[] hosts = hostAndPort[0].split(DIVISION_STRING);
|
||||
// fetch the last one
|
||||
masterServer.setHost(hosts[hosts.length - 1]);
|
||||
masterServer.setPort(Integer.parseInt(hostAndPort[1]));
|
||||
masterServers.add(masterServer);
|
||||
}
|
||||
return masterServers;
|
||||
}
|
||||
|
||||
/**
|
||||
* get server list.
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return server list
|
||||
*/
|
||||
public List<Server> getServersList(ZKNodeType zkNodeType){
|
||||
Map<String, String> masterMap = getServerMaps(zkNodeType);
|
||||
String parentPath = getZNodeParentPath(zkNodeType);
|
||||
/**
|
||||
* get master server list map.
|
||||
*
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return result : {host : resource info}
|
||||
*/
|
||||
public Map<String, String> getServerMaps(ZKNodeType zkNodeType) {
|
||||
|
||||
List<Server> masterServers = new ArrayList<>();
|
||||
for (Map.Entry<String, String> entry : masterMap.entrySet()) {
|
||||
Server masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
|
||||
if(masterServer == null){
|
||||
continue;
|
||||
}
|
||||
String key = entry.getKey();
|
||||
masterServer.setZkDirectory(parentPath + "/"+ key);
|
||||
//set host and port
|
||||
String[] hostAndPort=key.split(COLON);
|
||||
String[] hosts=hostAndPort[0].split(DIVISION_STRING);
|
||||
// fetch the last one
|
||||
masterServer.setHost(hosts[hosts.length-1]);
|
||||
masterServer.setPort(Integer.parseInt(hostAndPort[1]));
|
||||
masterServers.add(masterServer);
|
||||
}
|
||||
return masterServers;
|
||||
}
|
||||
Map<String, String> masterMap = new HashMap<>();
|
||||
try {
|
||||
String path = getZNodeParentPath(zkNodeType);
|
||||
List<String> serverList = super.getChildrenKeys(path);
|
||||
if (zkNodeType == ZKNodeType.WORKER) {
|
||||
List<String> workerList = new ArrayList<>();
|
||||
for (String group : serverList) {
|
||||
List<String> groupServers = super.getChildrenKeys(path + Constants.SLASH + group);
|
||||
for (String groupServer : groupServers) {
|
||||
workerList.add(group + Constants.SLASH + groupServer);
|
||||
}
|
||||
}
|
||||
serverList = workerList;
|
||||
}
|
||||
for (String server : serverList) {
|
||||
masterMap.putIfAbsent(server, super.get(path + Constants.SLASH + server));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("get server list failed", e);
|
||||
}
|
||||
|
||||
/**
|
||||
* get master server list map.
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return result : {host : resource info}
|
||||
*/
|
||||
public Map<String, String> getServerMaps(ZKNodeType zkNodeType){
|
||||
return masterMap;
|
||||
}
|
||||
|
||||
Map<String, String> masterMap = new HashMap<>();
|
||||
try {
|
||||
String path = getZNodeParentPath(zkNodeType);
|
||||
List<String> serverList = super.getChildrenKeys(path);
|
||||
if(zkNodeType == ZKNodeType.WORKER){
|
||||
List<String> workerList = new ArrayList<>();
|
||||
for(String group : serverList){
|
||||
List<String> groupServers = super.getChildrenKeys(path + Constants.SLASH + group);
|
||||
for(String groupServer : groupServers){
|
||||
workerList.add(group + Constants.SLASH + groupServer);
|
||||
}
|
||||
}
|
||||
serverList = workerList;
|
||||
}
|
||||
for(String server : serverList){
|
||||
masterMap.putIfAbsent(server, super.get(path + Constants.SLASH + server));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("get server list failed", e);
|
||||
}
|
||||
/**
|
||||
* check the zookeeper node already exists
|
||||
*
|
||||
* @param host host
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return true if exists
|
||||
*/
|
||||
public boolean checkZKNodeExists(String host, ZKNodeType zkNodeType) {
|
||||
String path = getZNodeParentPath(zkNodeType);
|
||||
if (StringUtils.isEmpty(path)) {
|
||||
logger.error("check zk node exists error, host:{}, zk node type:{}",
|
||||
host, zkNodeType);
|
||||
return false;
|
||||
}
|
||||
Map<String, String> serverMaps = getServerMaps(zkNodeType);
|
||||
for (String hostKey : serverMaps.keySet()) {
|
||||
if (hostKey.contains(host)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return masterMap;
|
||||
}
|
||||
/**
|
||||
* @return get worker node parent path
|
||||
*/
|
||||
protected String getWorkerZNodeParentPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_WORKERS;
|
||||
}
|
||||
|
||||
/**
|
||||
* check the zookeeper node already exists
|
||||
* @param host host
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return true if exists
|
||||
*/
|
||||
public boolean checkZKNodeExists(String host, ZKNodeType zkNodeType) {
|
||||
String path = getZNodeParentPath(zkNodeType);
|
||||
if(StringUtils.isEmpty(path)){
|
||||
logger.error("check zk node exists error, host:{}, zk node type:{}",
|
||||
host, zkNodeType.toString());
|
||||
return false;
|
||||
}
|
||||
Map<String, String> serverMaps = getServerMaps(zkNodeType);
|
||||
for(String hostKey : serverMaps.keySet()){
|
||||
if(hostKey.contains(host)){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* @return get master node parent path
|
||||
*/
|
||||
protected String getMasterZNodeParentPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_MASTERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get worker node parent path
|
||||
*/
|
||||
protected String getWorkerZNodeParentPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_WORKERS;
|
||||
}
|
||||
/**
|
||||
* @return get master lock path
|
||||
*/
|
||||
public String getMasterLockPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_MASTERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get master node parent path
|
||||
*/
|
||||
protected String getMasterZNodeParentPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_MASTERS;
|
||||
}
|
||||
/**
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return get zookeeper node parent path
|
||||
*/
|
||||
public String getZNodeParentPath(ZKNodeType zkNodeType) {
|
||||
String path = "";
|
||||
switch (zkNodeType) {
|
||||
case MASTER:
|
||||
return getMasterZNodeParentPath();
|
||||
case WORKER:
|
||||
return getWorkerZNodeParentPath();
|
||||
case DEAD_SERVER:
|
||||
return getDeadZNodeParentPath();
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get master lock path
|
||||
*/
|
||||
public String getMasterLockPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_MASTERS;
|
||||
}
|
||||
/**
|
||||
* @return get dead server node parent path
|
||||
*/
|
||||
protected String getDeadZNodeParentPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_DEAD_SERVERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param zkNodeType zookeeper node type
|
||||
* @return get zookeeper node parent path
|
||||
*/
|
||||
public String getZNodeParentPath(ZKNodeType zkNodeType) {
|
||||
String path = "";
|
||||
switch (zkNodeType){
|
||||
case MASTER:
|
||||
return getMasterZNodeParentPath();
|
||||
case WORKER:
|
||||
return getWorkerZNodeParentPath();
|
||||
case DEAD_SERVER:
|
||||
return getDeadZNodeParentPath();
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return path;
|
||||
}
|
||||
/**
|
||||
* @return get master start up lock path
|
||||
*/
|
||||
public String getMasterStartUpLockPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get dead server node parent path
|
||||
*/
|
||||
protected String getDeadZNodeParentPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_DEAD_SERVERS;
|
||||
}
|
||||
/**
|
||||
* @return get master failover lock path
|
||||
*/
|
||||
public String getMasterFailoverLockPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get master start up lock path
|
||||
*/
|
||||
public String getMasterStartUpLockPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS;
|
||||
}
|
||||
/**
|
||||
* @return get worker failover lock path
|
||||
*/
|
||||
public String getWorkerFailoverLockPath() {
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get master failover lock path
|
||||
*/
|
||||
public String getMasterFailoverLockPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS;
|
||||
}
|
||||
/**
|
||||
* release mutex
|
||||
*
|
||||
* @param mutex mutex
|
||||
*/
|
||||
public void releaseMutex(InterProcessMutex mutex) {
|
||||
if (mutex != null) {
|
||||
try {
|
||||
mutex.release();
|
||||
} catch (Exception e) {
|
||||
if ("instance must be started before calling this method".equals(e.getMessage())) {
|
||||
logger.warn("lock release");
|
||||
} else {
|
||||
logger.error("lock release failed", e);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return get worker failover lock path
|
||||
*/
|
||||
public String getWorkerFailoverLockPath(){
|
||||
return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* release mutex
|
||||
* @param mutex mutex
|
||||
*/
|
||||
public void releaseMutex(InterProcessMutex mutex) {
|
||||
if (mutex != null){
|
||||
try {
|
||||
mutex.release();
|
||||
} catch (Exception e) {
|
||||
if("instance must be started before calling this method".equals(e.getMessage())){
|
||||
logger.warn("lock release");
|
||||
}else{
|
||||
logger.error("lock release failed",e);
|
||||
}
|
||||
/**
|
||||
* init system znode
|
||||
*/
|
||||
protected void initSystemZNode() {
|
||||
try {
|
||||
persist(getMasterZNodeParentPath(), "");
|
||||
persist(getWorkerZNodeParentPath(), "");
|
||||
persist(getDeadZNodeParentPath(), "");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
logger.info("initialize server nodes success.");
|
||||
} catch (Exception e) {
|
||||
logger.error("init system znode failed", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* init system znode
|
||||
*/
|
||||
protected void initSystemZNode(){
|
||||
try {
|
||||
persist(getMasterZNodeParentPath(), "");
|
||||
persist(getWorkerZNodeParentPath(), "");
|
||||
persist(getDeadZNodeParentPath(), "");
|
||||
/**
|
||||
* get host ip, string format: masterParentPath/ip
|
||||
*
|
||||
* @param path path
|
||||
* @return host ip, string format: masterParentPath/ip
|
||||
*/
|
||||
protected String getHostByEventDataPath(String path) {
|
||||
if (StringUtils.isEmpty(path)) {
|
||||
logger.error("empty path!");
|
||||
return "";
|
||||
}
|
||||
String[] pathArray = path.split(SINGLE_SLASH);
|
||||
if (pathArray.length < 1) {
|
||||
logger.error("parse ip error: {}", path);
|
||||
return "";
|
||||
}
|
||||
return pathArray[pathArray.length - 1];
|
||||
|
||||
logger.info("initialize server nodes success.");
|
||||
} catch (Exception e) {
|
||||
logger.error("init system znode failed",e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get host ip, string format: masterParentPath/ip
|
||||
* @param path path
|
||||
* @return host ip, string format: masterParentPath/ip
|
||||
*/
|
||||
protected String getHostByEventDataPath(String path) {
|
||||
if(StringUtils.isEmpty(path)){
|
||||
logger.error("empty path!");
|
||||
return "";
|
||||
}
|
||||
String[] pathArray = path.split(SINGLE_SLASH);
|
||||
if(pathArray.length < 1){
|
||||
logger.error("parse ip error: {}", path);
|
||||
return "";
|
||||
}
|
||||
return pathArray[pathArray.length - 1];
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "AbstractZKClient{" +
|
||||
"zkClient=" + getZkClient() +
|
||||
", deadServerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.DEAD_SERVER) + '\'' +
|
||||
", masterZNodeParentPath='" + getZNodeParentPath(ZKNodeType.MASTER) + '\'' +
|
||||
", workerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.WORKER) + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return "AbstractZKClient{"
|
||||
+ "zkClient=" + getZkClient()
|
||||
+ ", deadServerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.DEAD_SERVER) + '\''
|
||||
+ ", masterZNodeParentPath='" + getZNodeParentPath(ZKNodeType.MASTER) + '\''
|
||||
+ ", workerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.WORKER) + '\''
|
||||
+ '}';
|
||||
}
|
||||
}
|
||||
|
@ -14,9 +14,14 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.zk;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
|
||||
|
||||
import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
import org.apache.curator.framework.CuratorFrameworkFactory;
|
||||
import org.apache.curator.framework.api.ACLProvider;
|
||||
@ -25,18 +30,16 @@ import org.apache.curator.retry.ExponentialBackoffRetry;
|
||||
import org.apache.zookeeper.ZooDefs;
|
||||
import org.apache.zookeeper.data.ACL;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Shared Curator zookeeper client
|
||||
*/
|
||||
@ -49,7 +52,6 @@ public class CuratorZookeeperClient implements InitializingBean {
|
||||
|
||||
private CuratorFramework zkClient;
|
||||
|
||||
|
||||
@Override
|
||||
public void afterPropertiesSet() throws Exception {
|
||||
this.zkClient = buildClient();
|
||||
@ -91,7 +93,7 @@ public class CuratorZookeeperClient implements InitializingBean {
|
||||
zkClient.blockUntilConnected(30, TimeUnit.SECONDS);
|
||||
|
||||
} catch (final Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
throw new ServiceException(ex);
|
||||
}
|
||||
return zkClient;
|
||||
}
|
||||
@ -123,4 +125,4 @@ public class CuratorZookeeperClient implements InitializingBean {
|
||||
public CuratorFramework getZkClient() {
|
||||
return zkClient;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -14,19 +14,22 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.zk;
|
||||
|
||||
import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
|
||||
import org.apache.zookeeper.server.ZooKeeperServer;
|
||||
import org.apache.zookeeper.server.ZooKeeperServerMain;
|
||||
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* just speed experience version
|
||||
@ -51,10 +54,10 @@ public class ZKServer {
|
||||
ZKServer zkServer;
|
||||
if (args.length == 0) {
|
||||
zkServer = new ZKServer();
|
||||
} else if (args.length == 1){
|
||||
zkServer = new ZKServer(Integer.valueOf(args[0]), "");
|
||||
} else if (args.length == 1) {
|
||||
zkServer = new ZKServer(Integer.parseInt(args[0]), "");
|
||||
} else {
|
||||
zkServer = new ZKServer(Integer.valueOf(args[0]), args[1]);
|
||||
zkServer = new ZKServer(Integer.parseInt(args[0]), args[1]);
|
||||
}
|
||||
zkServer.registerHook();
|
||||
zkServer.start();
|
||||
@ -73,7 +76,7 @@ public class ZKServer {
|
||||
}
|
||||
|
||||
private void registerHook() {
|
||||
/**
|
||||
/*
|
||||
* register hooks, which are called before the process exits
|
||||
*/
|
||||
Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
|
||||
@ -90,7 +93,7 @@ public class ZKServer {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isStarted(){
|
||||
public boolean isStarted() {
|
||||
return isStarted.get();
|
||||
}
|
||||
|
||||
@ -119,19 +122,19 @@ public class ZKServer {
|
||||
if (file.exists()) {
|
||||
logger.warn("The path of zk server exists");
|
||||
}
|
||||
logger.info("zk server starting, data dir path:{}" , zkDataDir);
|
||||
startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME,"60");
|
||||
logger.info("zk server starting, data dir path:{}", zkDataDir);
|
||||
startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME, "60");
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts a local Zk instance
|
||||
*
|
||||
* @param port The port to listen on
|
||||
* @param port The port to listen on
|
||||
* @param dataDirPath The path for the Zk data directory
|
||||
* @param tickTime zk tick time
|
||||
* @param maxClientCnxns zk max client connections
|
||||
* @param tickTime zk tick time
|
||||
* @param maxClientCnxns zk max client connections
|
||||
*/
|
||||
private void startLocalZkServer(final int port, final String dataDirPath,final int tickTime,String maxClientCnxns) {
|
||||
private void startLocalZkServer(final int port, final String dataDirPath, final int tickTime, String maxClientCnxns) {
|
||||
if (isStarted.compareAndSet(false, true)) {
|
||||
zooKeeperServerMain = new PublicZooKeeperServerMain();
|
||||
logger.info("Zookeeper data path : {} ", dataDirPath);
|
||||
@ -144,8 +147,7 @@ public class ZKServer {
|
||||
|
||||
zooKeeperServerMain.initializeAndRun(args);
|
||||
} catch (QuorumPeerConfig.ConfigException | IOException e) {
|
||||
logger.warn("Caught exception while starting ZK", e);
|
||||
throw new RuntimeException(e);
|
||||
throw new ServiceException("Caught exception while starting ZK", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -159,7 +161,7 @@ public class ZKServer {
|
||||
logger.info("zk server stopped");
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("Failed to stop ZK ",e);
|
||||
logger.error("Failed to stop ZK ", e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -180,8 +182,7 @@ public class ZKServer {
|
||||
org.apache.commons.io.FileUtils.deleteDirectory(new File(dataDir));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.warn("Caught exception while stopping ZK server", e);
|
||||
throw new RuntimeException(e);
|
||||
throw new ServiceException("Caught exception while starting ZK", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -14,21 +14,24 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.zk;
|
||||
|
||||
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
import org.apache.curator.framework.recipes.cache.ChildData;
|
||||
import org.apache.curator.framework.recipes.cache.TreeCache;
|
||||
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
|
||||
import org.apache.curator.framework.recipes.cache.TreeCacheListener;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@Component
|
||||
public class ZookeeperCachedOperator extends ZookeeperOperator {
|
||||
|
||||
@ -36,6 +39,7 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
|
||||
|
||||
|
||||
private TreeCache treeCache;
|
||||
|
||||
/**
|
||||
* register a unified listener of /${dsRoot},
|
||||
*/
|
||||
@ -59,14 +63,16 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
|
||||
treeCache.start();
|
||||
} catch (Exception e) {
|
||||
logger.error("add listener to zk path: {} failed", getZookeeperConfig().getDsRoot());
|
||||
throw new RuntimeException(e);
|
||||
throw new ServiceException(e);
|
||||
}
|
||||
}
|
||||
|
||||
//for sub class
|
||||
protected void dataChanged(final CuratorFramework client, final TreeCacheEvent event, final String path){}
|
||||
protected void dataChanged(final CuratorFramework client, final TreeCacheEvent event, final String path) {
|
||||
// Used by sub class
|
||||
}
|
||||
|
||||
public String getFromCache(final String cachePath, final String key) {
|
||||
public String getFromCache(final String key) {
|
||||
ChildData resultInCache = treeCache.getCurrentData(key);
|
||||
if (null != resultInCache) {
|
||||
return null == resultInCache.getData() ? null : new String(resultInCache.getData(), StandardCharsets.UTF_8);
|
||||
@ -74,11 +80,11 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
|
||||
return null;
|
||||
}
|
||||
|
||||
public TreeCache getTreeCache(final String cachePath) {
|
||||
public TreeCache getTreeCache() {
|
||||
return treeCache;
|
||||
}
|
||||
|
||||
public void addListener(TreeCacheListener listener){
|
||||
public void addListener(TreeCacheListener listener) {
|
||||
this.treeCache.getListenable().addListener(listener);
|
||||
}
|
||||
|
||||
|
@ -14,13 +14,17 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.service.zk;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
|
||||
|
||||
import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
|
||||
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
import org.apache.curator.framework.CuratorFrameworkFactory;
|
||||
import org.apache.curator.framework.api.ACLProvider;
|
||||
import org.apache.curator.framework.api.transaction.CuratorOp;
|
||||
import org.apache.curator.framework.state.ConnectionState;
|
||||
import org.apache.curator.retry.ExponentialBackoffRetry;
|
||||
import org.apache.curator.utils.CloseableUtils;
|
||||
@ -29,18 +33,16 @@ import org.apache.zookeeper.KeeperException;
|
||||
import org.apache.zookeeper.ZooDefs;
|
||||
import org.apache.zookeeper.data.ACL;
|
||||
import org.apache.zookeeper.data.Stat;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* zk base operator
|
||||
*/
|
||||
@ -64,19 +66,23 @@ public class ZookeeperOperator implements InitializingBean {
|
||||
/**
|
||||
* this method is for sub class,
|
||||
*/
|
||||
protected void registerListener(){}
|
||||
protected void registerListener() {
|
||||
// Used by sub class
|
||||
}
|
||||
|
||||
protected void treeCacheStart(){}
|
||||
protected void treeCacheStart() {
|
||||
// Used by sub class
|
||||
}
|
||||
|
||||
public void initStateLister() {
|
||||
checkNotNull(zkClient);
|
||||
|
||||
zkClient.getConnectionStateListenable().addListener((client, newState) -> {
|
||||
if(newState == ConnectionState.LOST){
|
||||
if (newState == ConnectionState.LOST) {
|
||||
logger.error("connection lost from zookeeper");
|
||||
} else if(newState == ConnectionState.RECONNECTED){
|
||||
} else if (newState == ConnectionState.RECONNECTED) {
|
||||
logger.info("reconnected to zookeeper");
|
||||
} else if(newState == ConnectionState.SUSPENDED){
|
||||
} else if (newState == ConnectionState.SUSPENDED) {
|
||||
logger.warn("connection SUSPENDED to zookeeper");
|
||||
}
|
||||
});
|
||||
@ -85,7 +91,8 @@ public class ZookeeperOperator implements InitializingBean {
|
||||
private CuratorFramework buildClient() {
|
||||
logger.info("zookeeper registry center init, server lists is: {}.", zookeeperConfig.getServerList());
|
||||
|
||||
CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder().ensembleProvider(new DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),"zookeeper quorum can't be null")))
|
||||
CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder().ensembleProvider(new DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),
|
||||
"zookeeper quorum can't be null")))
|
||||
.retryPolicy(new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMs(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepMs()));
|
||||
|
||||
//these has default value
|
||||
@ -114,7 +121,7 @@ public class ZookeeperOperator implements InitializingBean {
|
||||
try {
|
||||
zkClient.blockUntilConnected();
|
||||
} catch (final Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
throw new ServiceException(ex);
|
||||
}
|
||||
return zkClient;
|
||||
}
|
||||
@ -138,12 +145,12 @@ public class ZookeeperOperator implements InitializingBean {
|
||||
throw new IllegalStateException(ex);
|
||||
} catch (Exception ex) {
|
||||
logger.error("getChildrenKeys key : {}", key, ex);
|
||||
throw new RuntimeException(ex);
|
||||
throw new ServiceException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasChildren(final String key){
|
||||
Stat stat ;
|
||||
public boolean hasChildren(final String key) {
|
||||
Stat stat;
|
||||
try {
|
||||
stat = zkClient.checkExists().forPath(key);
|
||||
return stat.getNumChildren() >= 1;
|
||||
@ -241,4 +248,4 @@ public class ZookeeperOperator implements InitializingBean {
|
||||
public void close() {
|
||||
CloseableUtils.closeQuietly(zkClient);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -22,6 +22,7 @@
|
||||
<el-button size="mini" @click="_create('')">{{$t('Create Datasource')}}</el-button>
|
||||
<el-dialog
|
||||
:title="item ?($t('Edit')+$t('Datasource')) : ($t('Create')+$t('Datasource'))"
|
||||
v-if="dialogVisible"
|
||||
:visible.sync="dialogVisible"
|
||||
width="auto"
|
||||
:append-to-body="true">
|
||||
|
2
pom.xml
2
pom.xml
@ -973,6 +973,8 @@
|
||||
<include>**/plugin/alert/script/ScriptSenderTest.java</include>
|
||||
<include>**/plugin/alert/http/HttpAlertChannelFactoryTest.java</include>
|
||||
<include>**/plugin/alert/http/HttpAlertChannelTest.java</include>
|
||||
<include>**/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java</include>
|
||||
<include>**/plugin/alert/feishu/FeiShuSenderTest.java</include>
|
||||
<include>**/plugin/alert/http/HttpAlertPluginTest.java</include>
|
||||
<include>**/plugin/alert/http/HttpSenderTest.java</include>
|
||||
<include>**/spi/params/PluginParamsTransferTest.java</include>
|
||||
|
@ -121,6 +121,7 @@ DROP FUNCTION IF EXISTS ct_dolphin_T_t_ds_process_definition_version();
|
||||
|
||||
|
||||
-- add t_ds_resources_un
|
||||
delimiter d//
|
||||
CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_resources_un() RETURNS void AS $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
@ -129,11 +130,13 @@ BEGIN
|
||||
AND CONSTRAINT_NAME = 't_ds_resources_un'
|
||||
)
|
||||
THEN
|
||||
ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type");
|
||||
END IF;
|
||||
ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type");
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
d//
|
||||
|
||||
delimiter ;
|
||||
SELECT uc_dolphin_T_t_ds_resources_un();
|
||||
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_resources_un();
|
||||
|
||||
|
@ -52,7 +52,8 @@ BEGIN
|
||||
WHERE TABLE_NAME='t_ds_process_definition'
|
||||
AND COLUMN_NAME ='warning_group_id')
|
||||
THEN
|
||||
ALTER TABLE t_ds_process_definition ADD COLUMN `warning_group_id` int4 DEFAULT NULL COMMENT 'alert group id' AFTER `connects`;
|
||||
ALTER TABLE t_ds_process_definition ADD COLUMN warning_group_id int4 DEFAULT NULL;
|
||||
COMMENT ON COLUMN t_ds_process_definition.warning_group_id IS 'alert group id';
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
@ -70,7 +71,8 @@ BEGIN
|
||||
WHERE TABLE_NAME='t_ds_process_definition_version'
|
||||
AND COLUMN_NAME ='warning_group_id')
|
||||
THEN
|
||||
ALTER TABLE t_ds_process_definition_version ADD COLUMN `warning_group_id` int4 DEFAULT NULL COMMENT 'alert group id' AFTER `connects`;
|
||||
ALTER TABLE t_ds_process_definition_version ADD COLUMN warning_group_id int4 DEFAULT NULL;
|
||||
COMMENT ON COLUMN t_ds_process_definition_version.warning_group_id IS 'alert group id';
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
@ -88,7 +90,8 @@ BEGIN
|
||||
WHERE TABLE_NAME='t_ds_alertgroup'
|
||||
AND COLUMN_NAME ='alert_instance_ids')
|
||||
THEN
|
||||
ALTER TABLE t_ds_alertgroup ADD COLUMN `alert_instance_ids` varchar (255) DEFAULT NULL COMMENT 'alert instance ids' AFTER `id`;
|
||||
ALTER TABLE t_ds_alertgroup ADD COLUMN alert_instance_ids varchar (255) DEFAULT NULL;
|
||||
COMMENT ON COLUMN t_ds_alertgroup.alert_instance_ids IS 'alert instance ids';
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
@ -106,7 +109,8 @@ BEGIN
|
||||
WHERE TABLE_NAME='t_ds_alertgroup'
|
||||
AND COLUMN_NAME ='create_user_id')
|
||||
THEN
|
||||
ALTER TABLE t_ds_alertgroup ADD COLUMN `create_user_id` int4 DEFAULT NULL COMMENT 'create user id' AFTER `alert_instance_ids`;
|
||||
ALTER TABLE t_ds_alertgroup ADD COLUMN create_user_id int4 DEFAULT NULL;
|
||||
COMMENT ON COLUMN t_ds_alertgroup.create_user_id IS 'create user id';
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
Loading…
Reference in New Issue
Block a user