Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
0ca30862
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
0ca30862
编写于
8月 13, 2022
作者:
W
Wenjun Ruan
提交者:
GitHub
8月 13, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix workflow instance may failover many times due to doesn't check the restart time (#11445)
上级
2240b6e7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
13 deletion
+27
-13
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java
...cheduler/server/master/service/MasterFailoverService.java
+23
-12
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java
...nscheduler/server/master/service/FailoverServiceTest.java
+4
-1
未找到文件。
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java
浏览文件 @
0ca30862
...
...
@@ -17,6 +17,11 @@
package
org.apache.dolphinscheduler.server.master.service
;
import
io.micrometer.core.annotation.Counted
;
import
io.micrometer.core.annotation.Timed
;
import
lombok.NonNull
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.time.StopWatch
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.Flag
;
import
org.apache.dolphinscheduler.common.enums.NodeType
;
...
...
@@ -31,6 +36,7 @@ import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import
org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand
;
import
org.apache.dolphinscheduler.remote.utils.Host
;
import
org.apache.dolphinscheduler.server.master.builder.TaskExecutionContextBuilder
;
import
org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager
;
import
org.apache.dolphinscheduler.server.master.config.MasterConfig
;
import
org.apache.dolphinscheduler.server.master.dispatch.exceptions.ExecuteException
;
import
org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager
;
...
...
@@ -41,9 +47,9 @@ import org.apache.dolphinscheduler.server.utils.ProcessUtils;
import
org.apache.dolphinscheduler.service.process.ProcessService
;
import
org.apache.dolphinscheduler.service.registry.RegistryClient
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
import
org.
apache.commons.collections4.CollectionUtils
;
import
org.
apache.commons.lang3.time.StopWatch
;
import
org.slf4j.Logger
;
import
org.
slf4j.LoggerFactory
;
import
org.
springframework.stereotype.Service
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -51,14 +57,6 @@ import java.util.Optional;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Service
;
import
io.micrometer.core.annotation.Counted
;
import
io.micrometer.core.annotation.Timed
;
import
lombok.NonNull
;
@Service
public
class
MasterFailoverService
{
...
...
@@ -70,15 +68,19 @@ public class MasterFailoverService {
private
final
NettyExecutorManager
nettyExecutorManager
;
private
final
ProcessInstanceExecCacheManager
processInstanceExecCacheManager
;
public
MasterFailoverService
(
@NonNull
RegistryClient
registryClient
,
@NonNull
MasterConfig
masterConfig
,
@NonNull
ProcessService
processService
,
@NonNull
NettyExecutorManager
nettyExecutorManager
)
{
@NonNull
NettyExecutorManager
nettyExecutorManager
,
@NonNull
ProcessInstanceExecCacheManager
processInstanceExecCacheManager
)
{
this
.
registryClient
=
registryClient
;
this
.
masterConfig
=
masterConfig
;
this
.
processService
=
processService
;
this
.
localAddress
=
NetUtils
.
getAddr
(
masterConfig
.
getListenPort
());
this
.
nettyExecutorManager
=
nettyExecutorManager
;
this
.
processInstanceExecCacheManager
=
processInstanceExecCacheManager
;
}
...
...
@@ -283,6 +285,15 @@ public class MasterFailoverService {
// The processInstance is newly created
return
false
;
}
if
(
processInstance
.
getRestartTime
()
!=
null
&&
processInstance
.
getRestartTime
().
after
(
beFailoveredMasterStartupTime
))
{
// the processInstance is already be failovered.
return
false
;
}
if
(
processInstanceExecCacheManager
.
contains
(
processInstance
.
getId
()))
{
// the processInstance is a running process instance in the current master
return
false
;
}
return
true
;
}
...
...
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java
浏览文件 @
0ca30862
...
...
@@ -86,6 +86,9 @@ public class FailoverServiceTest {
@Mock
private
NettyExecutorManager
nettyExecutorManager
;
@Mock
private
ProcessInstanceExecCacheManager
processInstanceExecCacheManager
;
private
static
int
masterPort
=
5678
;
private
static
int
workerPort
=
1234
;
...
...
@@ -104,7 +107,7 @@ public class FailoverServiceTest {
given
(
masterConfig
.
getListenPort
()).
willReturn
(
masterPort
);
MasterFailoverService
masterFailoverService
=
new
MasterFailoverService
(
registryClient
,
masterConfig
,
processService
,
nettyExecutorManager
);
new
MasterFailoverService
(
registryClient
,
masterConfig
,
processService
,
nettyExecutorManager
,
processInstanceExecCacheManager
);
WorkerFailoverService
workerFailoverService
=
new
WorkerFailoverService
(
registryClient
,
masterConfig
,
processService
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录