Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
0da62e8d
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,发现更多精彩内容 >>
未验证
提交
0da62e8d
编写于
2月 25, 2017
作者:
W
WangTaoTheTonic
提交者:
Till Rohrmann
4月 19, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-5904] Make jobmanager.heap.mb and taskmanager.heap.mb work in YARN mode
This closes #3414.
上级
9fb074c9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
3 deletion
+22
-3
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
.../java/org/apache/flink/configuration/ConfigConstants.java
+1
-1
flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
...ava/org/apache/flink/configuration/JobManagerOptions.java
+5
-0
flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java
...va/org/apache/flink/configuration/TaskManagerOptions.java
+5
-0
flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
.../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
+11
-2
未找到文件。
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
浏览文件 @
0da62e8d
...
...
@@ -113,7 +113,7 @@ public final class ConfigConstants {
public
static
final
String
EXECUTION_RETRY_DELAY_KEY
=
"execution-retries.delay"
;
// -------------------------------- Runtime -------------------------------
/**
* The config parameter defining the network address to connect to
* for communication with the job manager.
...
...
flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
浏览文件 @
0da62e8d
...
...
@@ -57,6 +57,11 @@ public class JobManagerOptions {
key
(
"jobmanager.rpc.port"
)
.
defaultValue
(
6123
);
/** JVM heap size (in megabytes) for the JobManager */
public
static
final
ConfigOption
<
Integer
>
JOB_MANAGER_HEAP_MEMORY
=
key
(
"jobmanager.heap.mb"
)
.
defaultValue
(
1024
);
/**
* The maximum number of prior execution attempts kept in history.
*/
...
...
flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java
浏览文件 @
0da62e8d
...
...
@@ -39,6 +39,11 @@ public class TaskManagerOptions {
key
(
"taskmanager.jvm-exit-on-oom"
)
.
defaultValue
(
false
);
/** JVM heap size (in megabytes) for the TaskManagers */
public
static
final
ConfigOption
<
Integer
>
TASK_MANAGER_HEAP_MEMORY
=
key
(
"taskmanager.heap.mb"
)
.
defaultValue
(
1024
);
/** Size of memory buffers used by the network stack and the memory manager (in bytes). */
public
static
final
ConfigOption
<
Integer
>
MEMORY_SEGMENT_SIZE
=
key
(
"taskmanager.memory.segment-size"
)
...
...
flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
浏览文件 @
0da62e8d
...
...
@@ -26,10 +26,12 @@ import org.apache.flink.configuration.GlobalConfiguration;
import
org.apache.flink.configuration.IllegalConfigurationException
;
import
org.apache.flink.configuration.SecurityOptions
;
import
org.apache.flink.configuration.HighAvailabilityOptions
;
import
org.apache.flink.configuration.TaskManagerOptions
;
import
org.apache.flink.runtime.akka.AkkaUtils
;
import
org.apache.flink.runtime.clusterframework.BootstrapTools
;
import
org.apache.flink.runtime.jobgraph.JobGraph
;
import
org.apache.flink.runtime.jobmanager.HighAvailabilityMode
;
import
org.apache.flink.runtime.jobmanager.JobManagerOptions
;
import
org.apache.hadoop.conf.Configuration
;
import
org.apache.hadoop.fs.FileSystem
;
import
org.apache.hadoop.fs.Path
;
...
...
@@ -113,9 +115,9 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
*/
private
int
slots
=
-
1
;
private
int
jobManagerMemoryMb
=
1024
;
private
int
jobManagerMemoryMb
=
JobManagerOptions
.
JOB_MANAGER_HEAP_MEMORY
.
defaultValue
()
;
private
int
taskManagerMemoryMb
=
1024
;
private
int
taskManagerMemoryMb
=
TaskManagerOptions
.
TASK_MANAGER_HEAP_MEMORY
.
defaultValue
()
;
private
int
taskManagerCount
=
1
;
...
...
@@ -166,6 +168,13 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
flinkConfigurationPath
=
new
Path
(
confFile
.
getAbsolutePath
());
slots
=
flinkConfiguration
.
getInteger
(
ConfigConstants
.
TASK_MANAGER_NUM_TASK_SLOTS
,
1
);
if
(
flinkConfiguration
.
containsKey
(
JobManagerOptions
.
JOB_MANAGER_HEAP_MEMORY
.
key
()))
{
jobManagerMemoryMb
=
flinkConfiguration
.
getInteger
(
JobManagerOptions
.
JOB_MANAGER_HEAP_MEMORY
);
}
if
(
flinkConfiguration
.
containsKey
(
TaskManagerOptions
.
TASK_MANAGER_HEAP_MEMORY
.
key
()))
{
taskManagerMemoryMb
=
flinkConfiguration
.
getInteger
(
TaskManagerOptions
.
TASK_MANAGER_HEAP_MEMORY
);
}
}
catch
(
Exception
e
)
{
LOG
.
debug
(
"Config couldn't be loaded from environment variable."
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录