Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
4c91c83e
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4c91c83e
编写于
4月 23, 2020
作者:
K
Kevin
提交者:
GitHub
4月 23, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into dev
上级
381ab72e
f2bfdc14
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
73 deletion
+17
-73
dolphinscheduler-alert/src/test/resources/alert.properties
dolphinscheduler-alert/src/test/resources/alert.properties
+0
-67
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
...g/apache/dolphinscheduler/server/master/MasterServer.java
+5
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java
...org/apache/dolphinscheduler/server/zk/ZKMasterClient.java
+10
-2
script/dolphinscheduler-daemon.sh
script/dolphinscheduler-daemon.sh
+2
-2
未找到文件。
dolphinscheduler-alert/src/test/resources/alert.properties
已删除
100644 → 0
浏览文件 @
381ab72e
#
# 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.
#
# For unit test
#alert type is EMAIL/SMS
alert.type
=
EMAIL
# mail server configuration
mail.protocol
=
SMTP
mail.server.host
=
xxx.xxx.test
mail.server.port
=
25
mail.sender
=
xxx@xxx.com
mail.user
=
xxx@xxx.com
mail.passwd
=
111111
# Test double
test.server.factor
=
3.0
# Test NumberFormat
test.server.testnumber
=
abc
# Test array
test.server.list
=
xxx.xxx.test1,xxx.xxx.test2,xxx.xxx.test3
# Test enum
test.server.enum1
=
MASTER
test.server.enum2
=
DEAD_SERVER
test.server.enum3
=
abc
# TLS
mail.smtp.starttls.enable
=
true
# SSL
mail.smtp.ssl.enable
=
false
mail.smtp.ssl.trust
=
xxx.xxx.com
#xls file path,need create if not exist
xls.file.path
=
/tmp/xls
# Enterprise WeChat configuration
enterprise.wechat.enable
=
false
enterprise.wechat.corp.id
=
xxxxxxx
enterprise.wechat.secret
=
xxxxxxx
enterprise.wechat.agent.id
=
xxxxxxx
enterprise.wechat.users
=
xxxxxxx
enterprise.wechat.token.url
=
https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=$corpId&corpsecret=$secret
enterprise.wechat.push.url
=
https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=$token
enterprise.wechat.team.send.msg
=
{
\"
toparty
\"
:
\"
$toParty
\"
,
\"
agentid
\"
:
\"
$agentId
\"
,
\"
msgtype
\"
:
\"
text
\"
,
\"
text
\"
:{
\"
content
\"
:
\"
$msg
\"
},
\"
safe
\"
:
\"
0
\"
}
enterprise.wechat.user.send.msg
=
{
\"
touser
\"
:
\"
$toUser
\"
,
\"
agentid
\"
:
\"
$agentId
\"
,
\"
msgtype
\"
:
\"
markdown
\"
,
\"
markdown
\"
:{
\"
content
\"
:
\"
$msg
\"
}}
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
浏览文件 @
4c91c83e
...
...
@@ -117,9 +117,12 @@ public class MasterServer {
this
.
nettyRemotingServer
.
registerProcessor
(
CommandType
.
TASK_KILL_RESPONSE
,
new
TaskKillResponseProcessor
());
this
.
nettyRemotingServer
.
start
();
//
this
.
zkMasterClient
.
start
();
// register
this
.
masterRegistry
.
registry
();
// self tolerant
this
.
zkMasterClient
.
start
();
//
masterSchedulerService
.
start
();
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java
浏览文件 @
4c91c83e
...
...
@@ -24,6 +24,7 @@ import org.apache.dolphinscheduler.common.Constants;
import
org.apache.dolphinscheduler.common.enums.ExecutionStatus
;
import
org.apache.dolphinscheduler.common.enums.ZKNodeType
;
import
org.apache.dolphinscheduler.common.model.Server
;
import
org.apache.dolphinscheduler.common.thread.ThreadUtils
;
import
org.apache.dolphinscheduler.common.utils.OSUtils
;
import
org.apache.dolphinscheduler.dao.entity.ProcessInstance
;
import
org.apache.dolphinscheduler.dao.entity.TaskInstance
;
...
...
@@ -40,6 +41,8 @@ import org.springframework.stereotype.Component;
import
java.util.Date
;
import
java.util.List
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.*;
/**
* zookeeper master client
...
...
@@ -72,8 +75,13 @@ public class ZKMasterClient extends AbstractZKClient {
// init system znode
this
.
initSystemZNode
();
// check if fault tolerance is required?failure and tolerance
if
(
getActiveMasterNum
()
==
1
&&
checkZKNodeExists
(
OSUtils
.
getHost
(),
ZKNodeType
.
MASTER
))
{
while
(!
checkZKNodeExists
(
OSUtils
.
getHost
(),
ZKNodeType
.
MASTER
)){
ThreadUtils
.
sleep
(
SLEEP_TIME_MILLIS
);
}
// self tolerant
if
(
getActiveMasterNum
()
==
1
)
{
failoverWorker
(
null
,
true
);
failoverMaster
(
null
);
}
...
...
script/dolphinscheduler-daemon.sh
浏览文件 @
4c91c83e
...
...
@@ -41,7 +41,7 @@ export JAVA_HOME=$JAVA_HOME
#export JAVA_HOME=/opt/soft/jdk
export
HOSTNAME
=
`
hostname
`
export
DOLPHINSCHEDULER_PID_DIR
=
/tmp/
export
DOLPHINSCHEDULER_PID_DIR
=
$DOLPHINSCHEDULER_HOME
/pid
export
DOLPHINSCHEDULER_LOG_DIR
=
$DOLPHINSCHEDULER_HOME
/logs
export
DOLPHINSCHEDULER_CONF_DIR
=
$DOLPHINSCHEDULER_HOME
/conf
export
DOLPHINSCHEDULER_LIB_JARS
=
$DOLPHINSCHEDULER_HOME
/lib/
*
...
...
@@ -54,7 +54,7 @@ if [ ! -d "$DOLPHINSCHEDULER_LOG_DIR" ]; then
fi
log
=
$DOLPHINSCHEDULER_LOG_DIR
/dolphinscheduler-
$command
-
$HOSTNAME
.out
pid
=
$DOLPHINSCHEDULER_
LOG
_DIR
/dolphinscheduler-
$command
.pid
pid
=
$DOLPHINSCHEDULER_
PID
_DIR
/dolphinscheduler-
$command
.pid
cd
$DOLPHINSCHEDULER_HOME
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录