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/02/21 22:56:21 UTC
[02/13] flink git commit: [FLINK-8710] [YARN]
AbstractYarnClusterDescriptor doesn't use pre-defined configs in Hadoop's
YarnConfiguration
[FLINK-8710] [YARN] AbstractYarnClusterDescriptor doesn't use pre-defined configs in Hadoop's YarnConfiguration
This closes #5522.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d3114cd9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d3114cd9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d3114cd9
Branch: refs/heads/master
Commit: d3114cd90d99bb11f1f55b5d5ad0576527541b41
Parents: 2a18f05
Author: Bowen Li <bo...@gmail.com>
Authored: Mon Feb 19 00:04:54 2018 -0800
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Feb 21 22:49:05 2018 +0100
----------------------------------------------------------------------
.../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d3114cd9/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 d3fce4c..2d6926a 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
@@ -402,10 +402,9 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
}
/**
- * This method will block until the ApplicationMaster/JobManager have been
- * deployed on YARN.
+ * This method will block until the ApplicationMaster/JobManager have been deployed on YARN.
*
- * @param clusterSpecification Initial cluster specification for the to be deployed Flink cluster
+ * @param clusterSpecification Initial cluster specification for the Flink cluster to be deployed
* @param yarnClusterEntrypoint Class name of the Yarn cluster entry point.
* @param jobGraph A job graph which is deployed with the Flink cluster, {@code null} if none
* @param detached True if the cluster should be started in detached mode
@@ -459,7 +458,7 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
throw new YarnDeploymentException("Could not retrieve information about free cluster resources.", e);
}
- final int yarnMinAllocationMB = yarnConfiguration.getInt("yarn.scheduler.minimum-allocation-mb", 0);
+ final int yarnMinAllocationMB = yarnConfiguration.getInt(yarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 0);
final ClusterSpecification validClusterSpecification;
try {