ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: Revert "AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" enhanced config (aonishuk)"
Date Fri, 09 Oct 2015 06:44:51 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk cfe3c8041 -> a1f105496


Revert "AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" enhanced
config (aonishuk)"

This reverts commit 4011611574cf2c1de9517b165ec109feba97c622.


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

Branch: refs/heads/trunk
Commit: a1f105496dfad5085653f18097d6e1e18da7f224
Parents: cfe3c80
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Fri Oct 9 09:44:30 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Fri Oct 9 09:44:30 2015 +0300

----------------------------------------------------------------------
 .../internal/BlueprintConfigurationProcessor.java           | 2 --
 .../internal/BlueprintConfigurationProcessorTest.java       | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a1f10549/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 3d13725..5fd5563 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
@@ -1937,7 +1937,6 @@ 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);
@@ -2145,7 +2144,6 @@ 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/a1f10549/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 402c69d..ac86668 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
@@ -1427,13 +1427,11 @@ 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);
@@ -1446,8 +1444,6 @@ 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());
@@ -1501,9 +1497,6 @@ 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"));
 
   }
 


Mime
View raw message