AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" enhanced config (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f922634f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f922634f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f922634f Branch: refs/heads/branch-2.1 Commit: f922634ffd728e5286a3454b82e2e817d2de6b3f Parents: b10b1ff Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Tue Oct 6 12:39:11 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Tue Oct 6 12:39:11 2015 +0300 ---------------------------------------------------------------------- .../internal/BlueprintConfigurationProcessor.java | 2 ++ .../internal/BlueprintConfigurationProcessorTest.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f922634f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java index 892cf32..0535c96 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java @@ -1916,6 +1916,7 @@ public class BlueprintConfigurationProcessor { mPropertyUpdaters.put("hbase-env", hbaseEnvMap); mPropertyUpdaters.put("mapred-env", mapredEnvMap); mPropertyUpdaters.put("oozie-env", oozieEnvHeapSizeMap); + mPropertyUpdaters.put("yarn-site", yarnSiteMap); multiHostTopologyUpdaters.put("webhcat-site", multiWebhcatSiteMap); multiHostTopologyUpdaters.put("hbase-site", multiHbaseSiteMap); @@ -2057,6 +2058,7 @@ public class BlueprintConfigurationProcessor { hbaseEnvMap.put("hbase_regionserver_heapsize", new MPropertyUpdater()); oozieEnvHeapSizeMap.put("oozie_heapsize", new MPropertyUpdater()); oozieEnvHeapSizeMap.put("oozie_permsize", new MPropertyUpdater()); + yarnSiteMap.put("yarn.nodemanager.resource.memory-mb", new MPropertyUpdater()); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/f922634f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java index a97ca74..43da6c5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java @@ -1422,11 +1422,13 @@ public class BlueprintConfigurationProcessorTest { Map<String, String> oozieSiteProperties = new HashMap<String, String>(); Map<String, String> oozieEnvProperties = new HashMap<String, String>(); Map<String, String> coreSiteProperties = new HashMap<String, String>(); - + Map<String, String> yarnSiteProperties = new HashMap<String, String>(); + configProperties.put("oozie-site", oozieSiteProperties); configProperties.put("oozie-env", oozieEnvProperties); configProperties.put("hive-env", oozieEnvProperties); configProperties.put("core-site", coreSiteProperties); + configProperties.put("yarn-site", yarnSiteProperties); oozieSiteProperties.put("oozie.base.url", expectedHostName); oozieSiteProperties.put("oozie.authentication.kerberos.principal", expectedHostName); @@ -1439,6 +1441,8 @@ public class BlueprintConfigurationProcessorTest { oozieEnvProperties.put("oozie_permsize", "2048m"); coreSiteProperties.put("hadoop.proxyuser.oozie.hosts", expectedHostName + "," + expectedHostNameTwo); + + oozieEnvProperties.put("yarn.nodemanager.resource.memory-mb", "2048m"); Configuration clusterConfig = new Configuration(configProperties, Collections.<String, Map<String, Map<String, String>>>emptyMap()); @@ -1492,6 +1496,9 @@ public class BlueprintConfigurationProcessorTest { "1024m", oozieEnvProperties.get("oozie_heapsize")); assertEquals("oozie_permsize should have been included in exported configuration", "2048m", oozieEnvProperties.get("oozie_permsize")); + + assertEquals("yarn.nodemanager.resource.memory-mb should have been included in exported configuration", + "2048m", oozieEnvProperties.get("yarn.nodemanager.resource.memory-mb")); }
