Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
8411195b
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8411195b
编写于
9月 18, 2014
作者:
S
Stephan Ewen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve shutdown of JobManager (graceful exit of runing jobs and RPC service)
上级
3e644000
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
17 addition
and
13 deletion
+17
-13
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
.../java/org/apache/flink/runtime/jobmanager/JobManager.java
+17
-13
未找到文件。
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
浏览文件 @
8411195b
...
@@ -40,7 +40,6 @@ import org.apache.commons.cli.Option;
...
@@ -40,7 +40,6 @@ import org.apache.commons.cli.Option;
import
org.apache.commons.cli.OptionBuilder
;
import
org.apache.commons.cli.OptionBuilder
;
import
org.apache.commons.cli.Options
;
import
org.apache.commons.cli.Options
;
import
org.apache.commons.cli.ParseException
;
import
org.apache.commons.cli.ParseException
;
import
org.apache.flink.api.common.accumulators.Accumulator
;
import
org.apache.flink.api.common.accumulators.Accumulator
;
import
org.apache.flink.configuration.ConfigConstants
;
import
org.apache.flink.configuration.ConfigConstants
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.Configuration
;
...
@@ -61,6 +60,7 @@ import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager;
...
@@ -61,6 +60,7 @@ import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager;
import
org.apache.flink.runtime.executiongraph.ExecutionGraph
;
import
org.apache.flink.runtime.executiongraph.ExecutionGraph
;
import
org.apache.flink.runtime.executiongraph.ExecutionJobVertex
;
import
org.apache.flink.runtime.executiongraph.ExecutionJobVertex
;
import
org.apache.flink.runtime.executiongraph.JobStatusListener
;
import
org.apache.flink.runtime.executiongraph.JobStatusListener
;
import
org.apache.flink.runtime.instance.Hardware
;
import
org.apache.flink.runtime.instance.HardwareDescription
;
import
org.apache.flink.runtime.instance.HardwareDescription
;
import
org.apache.flink.runtime.instance.Instance
;
import
org.apache.flink.runtime.instance.Instance
;
import
org.apache.flink.runtime.instance.InstanceConnectionInfo
;
import
org.apache.flink.runtime.instance.InstanceConnectionInfo
;
...
@@ -92,7 +92,6 @@ import org.apache.flink.runtime.util.EnvironmentInformation;
...
@@ -92,7 +92,6 @@ import org.apache.flink.runtime.util.EnvironmentInformation;
import
org.apache.flink.runtime.util.ExecutorThreadFactory
;
import
org.apache.flink.runtime.util.ExecutorThreadFactory
;
import
org.apache.flink.runtime.util.SerializableArrayList
;
import
org.apache.flink.runtime.util.SerializableArrayList
;
import
org.apache.flink.util.StringUtils
;
import
org.apache.flink.util.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -112,7 +111,7 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
...
@@ -112,7 +111,7 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
/** Executor service for asynchronous commands (to relieve the RPC threads of work) */
/** Executor service for asynchronous commands (to relieve the RPC threads of work) */
private
final
ExecutorService
executorService
=
Executors
.
new
CachedThreadPool
(
ExecutorThreadFactory
.
INSTANCE
);
private
final
ExecutorService
executorService
=
Executors
.
new
FixedThreadPool
(
2
*
Hardware
.
getNumberCPUCores
(),
ExecutorThreadFactory
.
INSTANCE
);
/** The RPC end point through which the JobManager gets its calls */
/** The RPC end point through which the JobManager gets its calls */
...
@@ -231,17 +230,12 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
...
@@ -231,17 +230,12 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
return
;
return
;
}
}
// Stop instance manager
for
(
ExecutionGraph
e
:
this
.
currentJobs
.
values
())
{
if
(
this
.
instanceManager
!=
null
)
{
e
.
fail
(
new
Exception
(
"The JobManager is shutting down."
));
this
.
instanceManager
.
shutdown
();
}
// Stop RPC server
if
(
this
.
jobManagerServer
!=
null
)
{
this
.
jobManagerServer
.
stop
();
}
}
// Stop the executor service
// Stop the executor service
// this waits for any pending calls to be done
if
(
this
.
executorService
!=
null
)
{
if
(
this
.
executorService
!=
null
)
{
this
.
executorService
.
shutdown
();
this
.
executorService
.
shutdown
();
try
{
try
{
...
@@ -251,6 +245,16 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
...
@@ -251,6 +245,16 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
}
}
}
}
// Stop instance manager
if
(
this
.
instanceManager
!=
null
)
{
this
.
instanceManager
.
shutdown
();
}
// Stop RPC server
if
(
this
.
jobManagerServer
!=
null
)
{
this
.
jobManagerServer
.
stop
();
}
// Stop and clean up the job progress collector
// Stop and clean up the job progress collector
if
(
this
.
eventCollector
!=
null
)
{
if
(
this
.
eventCollector
!=
null
)
{
this
.
eventCollector
.
shutdown
();
this
.
eventCollector
.
shutdown
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录