You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/03/03 07:27:56 UTC
[4/6] flink git commit: [hotfix] Set default number of TaskManagers
in FlinkYarnSessionCli for Flip6
[hotfix] Set default number of TaskManagers in FlinkYarnSessionCli for Flip6
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/75b092db
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/75b092db
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/75b092db
Branch: refs/heads/release-1.5
Commit: 75b092db3b897aaaf3e13ccaaf8bfc51b8af00ca
Parents: b5c0fa8
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Mar 2 12:18:05 2018 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Sat Mar 3 00:09:01 2018 +0100
----------------------------------------------------------------------
.../org/apache/flink/yarn/cli/FlinkYarnSessionCli.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/75b092db/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
index 7773600..2cdc19d 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
@@ -378,7 +378,14 @@ public class FlinkYarnSessionCli extends AbstractCustomCommandLine<ApplicationId
throw new IllegalArgumentException("Missing required argument " + container.getOpt());
}
- int numberTaskManagers = Integer.valueOf(cmd.getOptionValue(container.getOpt()));
+ // TODO: The number of task manager should be deprecated soon
+ final int numberTaskManagers;
+
+ if (cmd.hasOption(container.getOpt())) {
+ numberTaskManagers = Integer.valueOf(cmd.getOptionValue(container.getOpt()));
+ } else {
+ numberTaskManagers = 1;
+ }
// JobManager Memory
final int jobManagerMemoryMB = configuration.getInteger(JobManagerOptions.JOB_MANAGER_HEAP_MEMORY);
@@ -386,7 +393,7 @@ public class FlinkYarnSessionCli extends AbstractCustomCommandLine<ApplicationId
// Task Managers memory
final int taskManagerMemoryMB = configuration.getInteger(TaskManagerOptions.TASK_MANAGER_HEAP_MEMORY);
- int slotsPerTaskManager = configuration.getInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, 1);
+ int slotsPerTaskManager = configuration.getInteger(TaskManagerOptions.NUM_TASK_SLOTS);
return new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(jobManagerMemoryMB)