You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2015/01/29 19:05:45 UTC
[02/34] hadoop git commit: YARN-3086. Make NodeManager memory
configurable in MiniYARNCluster. Contributed by Robert Metzger.
YARN-3086. Make NodeManager memory configurable in MiniYARNCluster. Contributed by Robert Metzger.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cfb00e73
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cfb00e73
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cfb00e73
Branch: refs/heads/HDFS-EC
Commit: cfb00e7320c21e446f2832da8c7bef772cdb359b
Parents: 6b67115
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Wed Jan 28 00:15:34 2015 +0900
Committer: Zhe Zhang <zh...@apache.org>
Committed: Thu Jan 29 10:05:23 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 5 +++++
.../java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 6 ++++--
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cfb00e73/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 924bfa6..52b3cab 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -206,6 +206,9 @@ Release 2.7.0 - UNRELEASED
YARN-3092. Created a common ResourceUsage class to track labeled resource
usages in Capacity Scheduler. (Wangda Tan via jianhe)
+ YARN-3086. Make NodeManager memory configurable in MiniYARNCluster.
+ (Robert Metzger via ozawa)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cfb00e73/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 2ccd894..015baa1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1205,6 +1205,11 @@ public class YarnConfiguration extends Configuration {
public static final boolean
DEFAULT_YARN_MINICLUSTER_CONTROL_RESOURCE_MONITORING = false;
+ /** Allow changing the memory for the NodeManager in the MiniYARNCluster */
+ public static final String YARN_MINICLUSTER_NM_PMEM_MB =
+ YARN_MC_PREFIX + YarnConfiguration.NM_PMEM_MB;
+ public static final int DEFAULT_YARN_MINICLUSTER_NM_PMEM_MB = 4 * 1024;
+
/** The log directory for the containers */
public static final String YARN_APP_CONTAINER_LOG_DIR =
YARN_PREFIX + "app.container.log.dir";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cfb00e73/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index 4bdf33a..365e0bb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -508,8 +508,10 @@ public class MiniYARNCluster extends CompositeService {
String logDirsString = prepareDirs("log", numLogDirs);
config.set(YarnConfiguration.NM_LOG_DIRS, logDirsString);
- // By default AM + 2 containers
- config.setInt(YarnConfiguration.NM_PMEM_MB, 4*1024);
+ config.setInt(YarnConfiguration.NM_PMEM_MB, config.getInt(
+ YarnConfiguration.YARN_MINICLUSTER_NM_PMEM_MB,
+ YarnConfiguration.DEFAULT_YARN_MINICLUSTER_NM_PMEM_MB));
+
config.set(YarnConfiguration.NM_ADDRESS,
MiniYARNCluster.getHostname() + ":0");
config.set(YarnConfiguration.NM_LOCALIZER_ADDRESS,