Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
839d6054
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,发现更多精彩内容 >>
未验证
提交
839d6054
编写于
8月 27, 2021
作者:
W
Wenjun Ruan
提交者:
GitHub
8月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix dead server cannot stop (#6046)
上级
04720b32
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
6 deletion
+8
-6
dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java
...cheduler/plugin/registry/zookeeper/ZookeeperRegistry.java
+5
-6
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
...g/apache/dolphinscheduler/server/worker/WorkerServer.java
+1
-0
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java
...ler/server/worker/runner/RetryReportTaskStatusThread.java
+1
-0
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
...inscheduler/server/worker/runner/WorkerManagerThread.java
+1
-0
未找到文件。
dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java
浏览文件 @
839d6054
...
...
@@ -47,6 +47,7 @@ import org.apache.curator.framework.recipes.locks.InterProcessMutex;
import
org.apache.curator.retry.ExponentialBackoffRetry
;
import
org.apache.curator.utils.CloseableUtils
;
import
org.apache.zookeeper.CreateMode
;
import
org.apache.zookeeper.KeeperException
;
import
org.apache.zookeeper.ZooDefs
;
import
org.apache.zookeeper.data.ACL
;
...
...
@@ -195,12 +196,7 @@ public class ZookeeperRegistry implements Registry {
@Override
public
void
remove
(
String
key
)
{
try
{
client
.
delete
().
deletingChildrenIfNeeded
().
forPath
(
key
);
}
catch
(
Exception
e
)
{
throw
new
RegistryException
(
"zookeeper remove error"
,
e
);
}
delete
(
key
);
}
@Override
...
...
@@ -269,6 +265,9 @@ public class ZookeeperRegistry implements Registry {
client
.
delete
()
.
deletingChildrenIfNeeded
()
.
forPath
(
nodePath
);
}
catch
(
KeeperException
.
NoNodeException
ignore
)
{
// the node is not exist, we can believe the node has been removed
}
catch
(
Exception
e
)
{
throw
new
RegistryException
(
"zookeeper delete key error"
,
e
);
}
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
浏览文件 @
839d6054
...
...
@@ -181,6 +181,7 @@ public class WorkerServer implements IStoppable {
this
.
nettyRemotingServer
.
close
();
this
.
workerRegistryClient
.
unRegistry
();
this
.
alertClientService
.
close
();
this
.
springApplicationContext
.
close
();
}
catch
(
Exception
e
)
{
logger
.
error
(
"worker server stop exception "
,
e
);
}
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java
浏览文件 @
839d6054
...
...
@@ -49,6 +49,7 @@ public class RetryReportTaskStatusThread implements Runnable {
public
void
start
(){
Thread
thread
=
new
Thread
(
this
,
"RetryReportTaskStatusThread"
);
thread
.
setDaemon
(
true
);
thread
.
start
();
}
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
浏览文件 @
839d6054
...
...
@@ -123,6 +123,7 @@ public class WorkerManagerThread implements Runnable {
public
void
start
()
{
Thread
thread
=
new
Thread
(
this
,
this
.
getClass
().
getName
());
thread
.
setDaemon
(
true
);
thread
.
start
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录