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 2017/03/31 13:38:15 UTC

flink git commit: [FLINK-5903] [yarn] Respect taskmanager.numberOfTaskSlots config value in Yarn mode

Repository: flink
Updated Branches:
  refs/heads/master 91c90c5d2 -> 2313a74e2


[FLINK-5903] [yarn] Respect taskmanager.numberOfTaskSlots config value in Yarn mode

This closes #3408.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2313a74e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2313a74e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2313a74e

Branch: refs/heads/master
Commit: 2313a74e2726167f9cb586a298d4c397f3b82b69
Parents: 91c90c5
Author: WangTaoTheTonic <wa...@huawei.com>
Authored: Fri Feb 24 16:11:47 2017 +0800
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Mar 31 15:37:59 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/2313a74e/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
index 8928f0a..b383b59 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
@@ -164,6 +164,8 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
 				throw new RuntimeException("Unable to locate configuration file in " + confFile);
 			}
 			flinkConfigurationPath = new Path(confFile.getAbsolutePath());
+
+			slots = flinkConfiguration.getInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, 1);
 		} catch (Exception e) {
 			LOG.debug("Config couldn't be loaded from environment variable.");
 		}