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

2015-10-09 Thread aonishuk 
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 
Authored: Fri Oct 9 09:44:30 2015 +0300
Committer: Andrew Onishuk 
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 oozieSiteProperties = new HashMap();
 Map oozieEnvProperties = new HashMap();
 Map coreSiteProperties = new HashMap();
-Map yarnSiteProperties = new HashMap();
-
+
 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.>>emptyMap());
@@ -1501,9 +1497,6 @@ public class BlueprintConfigurationProcessorTest {
   "1024m", oozieEnvProperties.get("oozie_heapsize"));
 assertEquals("oozie_permsize should have been included in

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

2015-10-09 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 46db8ff3d -> e1bb12518


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

This reverts commit f922634ffd728e5286a3454b82e2e817d2de6b3f.


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

Branch: refs/heads/branch-2.1
Commit: e1bb125182d160b9622ce0ada2ab07b9c39c273d
Parents: 46db8ff
Author: Andrew Onishuk 
Authored: Fri Oct 9 09:07:27 2015 +0300
Committer: Andrew Onishuk 
Committed: Fri Oct 9 09:41:41 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/e1bb1251/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 0535c96..892cf32 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,7 +1916,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);
@@ -2058,7 +2057,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/e1bb1251/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 43da6c5..a97ca74 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,13 +1422,11 @@ public class BlueprintConfigurationProcessorTest {
 Map oozieSiteProperties = new HashMap();
 Map oozieEnvProperties = new HashMap();
 Map coreSiteProperties = new HashMap();
-Map yarnSiteProperties = new HashMap();
-
+
 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);
@@ -1441,8 +1439,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.>>emptyMap());
@@ -1496,9 +1492,6 @@ public class BlueprintConfigurationProcessorTest {
   "1024m", oozieEnvProperties.get("oozie_heapsize"));
 assertEquals("oozie_permsize should have been included