Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
42f9385e
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
Star
9572
Fork
3514
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
42f9385e
编写于
3月 26, 2020
作者:
G
gabry.wu
提交者:
GitHub
3月 26, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adapting partial code(file name start with W) to the sonar cloud rule (#2287)
上级
a1b8386c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
14 deletion
+10
-14
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
...ache/dolphinscheduler/api/service/WorkerGroupService.java
+1
-1
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
...he/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
+2
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
...g/apache/dolphinscheduler/server/worker/WorkerServer.java
+7
-11
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
浏览文件 @
42f9385e
...
...
@@ -111,7 +111,7 @@ public class WorkerGroupService extends BaseService {
List
<
WorkerGroup
>
workerGroupList
=
workerGroupMapper
.
queryWorkerGroupByName
(
workerGroup
.
getName
());
if
(
workerGroupList
.
size
()
>
0
){
if
(
CollectionUtils
.
isNotEmpty
(
workerGroupList
)
){
// new group has same name..
if
(
workerGroup
.
getId
()
==
0
){
return
true
;
...
...
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
浏览文件 @
42f9385e
...
...
@@ -65,7 +65,7 @@ public class WorkerGroupMapperTest {
workerGroup
.
setName
(
"workerGroup11"
);
int
update
=
workerGroupMapper
.
updateById
(
workerGroup
);
workerGroupMapper
.
deleteById
(
workerGroup
.
getId
());
Assert
.
assertEquals
(
update
,
1
);
Assert
.
assertEquals
(
1
,
update
);
}
/**
...
...
@@ -77,7 +77,7 @@ public class WorkerGroupMapperTest {
WorkerGroup
workerGroup
=
insertOne
();
//delete
int
delete
=
workerGroupMapper
.
deleteById
(
workerGroup
.
getId
());
Assert
.
assertEquals
(
delete
,
1
);
Assert
.
assertEquals
(
1
,
delete
);
}
/**
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
浏览文件 @
42f9385e
...
...
@@ -52,7 +52,6 @@ import org.springframework.context.annotation.FilterType;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PreDestroy
;
import
java.util.Set
;
import
java.util.concurrent.CountDownLatch
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -255,7 +254,7 @@ public class WorkerServer implements IStoppable {
*/
private
Runnable
heartBeatThread
(){
logger
.
info
(
"start worker heart beat thread..."
);
Runnable
heartBeatThread
=
new
Runnable
()
{
return
new
Runnable
()
{
@Override
public
void
run
()
{
// send heartbeat to zk
...
...
@@ -266,7 +265,6 @@ public class WorkerServer implements IStoppable {
zkWorkerClient
.
heartBeatForZk
(
zkWorkerClient
.
getWorkerZNode
()
,
Constants
.
WORKER_PREFIX
);
}
};
return
heartBeatThread
;
}
...
...
@@ -276,7 +274,7 @@ public class WorkerServer implements IStoppable {
* @return kill process thread
*/
private
Runnable
getKillProcessThread
(){
Runnable
killProcessThread
=
new
Runnable
()
{
return
new
Runnable
()
{
@Override
public
void
run
()
{
logger
.
info
(
"start listening kill process thread..."
);
...
...
@@ -297,7 +295,6 @@ public class WorkerServer implements IStoppable {
}
}
};
return
killProcessThread
;
}
/**
...
...
@@ -307,17 +304,17 @@ public class WorkerServer implements IStoppable {
* @param pd process dao
*/
private
void
killTask
(
String
taskInfo
,
ProcessService
pd
)
{
logger
.
info
(
"get one kill command from tasks kill queue:
"
+
taskInfo
);
logger
.
info
(
"get one kill command from tasks kill queue:
{}"
,
taskInfo
);
String
[]
taskInfoArray
=
taskInfo
.
split
(
"-"
);
if
(
taskInfoArray
.
length
!=
2
){
logger
.
error
(
"error format kill info:
"
+
taskInfo
);
logger
.
error
(
"error format kill info:
{}"
,
taskInfo
);
return
;
}
String
host
=
taskInfoArray
[
0
];
int
taskInstanceId
=
Integer
.
parseInt
(
taskInfoArray
[
1
]);
TaskInstance
taskInstance
=
pd
.
getTaskInstanceDetailByTaskId
(
taskInstanceId
);
if
(
taskInstance
==
null
){
logger
.
error
(
"cannot find the kill task :
"
+
taskInfo
);
logger
.
error
(
"cannot find the kill task :
{}"
,
taskInfo
);
return
;
}
...
...
@@ -332,8 +329,7 @@ public class WorkerServer implements IStoppable {
}
else
if
(!
taskInstance
.
getState
().
typeIsFinished
()){
ProcessUtils
.
kill
(
taskInstance
);
}
else
{
logger
.
info
(
"the task aleady finish: task id: "
+
taskInstance
.
getId
()
+
" state: "
+
taskInstance
.
getState
().
toString
());
logger
.
info
(
"the task aleady finish: task id: {} state: {}"
,
taskInstance
.
getId
(),
taskInstance
.
getState
());
}
}
}
...
...
@@ -347,7 +343,7 @@ public class WorkerServer implements IStoppable {
private
void
deleteTaskFromQueue
(
TaskInstance
taskInstance
,
ProcessService
pd
){
// creating distributed locks, lock path /dolphinscheduler/lock/worker
InterProcessMutex
mutex
=
null
;
logger
.
info
(
"delete task from tasks queue:
"
+
taskInstance
.
getId
());
logger
.
info
(
"delete task from tasks queue:
{}"
,
taskInstance
.
getId
());
try
{
mutex
=
zkWorkerClient
.
acquireZkLock
(
zkWorkerClient
.
getZkClient
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录