AMBARI-3464: Mapred map and reduce memory properties need to be picked from stack. (jaimin)

ambari-agent/src/main/puppet/modules/hdp-pig/manifests/pig/service_check.pp

@@ -26,7 +26,7 @@ class hdp-pig::pig::service_check()
 
   $cleanup_cmd = "dfs -rmr ${output_file} ${input_file}"
   #cleanup put below to handle retries; if retrying there wil be a stale file that needs cleanup; exit code is fn of second command
-  $create_file_cmd = "${cleanup_cmd}; hadoop dfs -put /etc/passwd ${input_file} " #TODO: inconsistent that second comamnd needs hadoop
+  $create_file_cmd = "${cleanup_cmd}; hadoop dfs -put /etc/passwd ${input_file} " #TODO: inconsistent that second command needs hadoop
   $test_cmd = "fs -test -e ${output_file}" 
   
   anchor { 'hdp-pig::pig::service_check::begin':}

ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -166,11 +166,13 @@
   <property>
     <name>mapreduce.map.memory.mb</name>
     <value>1536</value>
+    <description>Virtual memory for single Map task</description>
   </property>
 
   <property>
     <name>mapreduce.reduce.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Reduce task</description>
   </property>
 
   <property>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -166,11 +166,13 @@
   <property>
     <name>mapreduce.map.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Map task</description>
   </property>
 
   <property>
     <name>mapreduce.reduce.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Reduce task</description>
   </property>
 
   <property>
@@ -321,13 +323,7 @@
     </description>
   </property>
 
-  <property>
-    <name>mapreduce.map.memory.mb</name>
-    <value>1024</value>
-    <description>
-      Larger resource limit for maps.
-    </description>
-  </property>
+
 
   <property>
     <name>mapreduce.map.java.opts</name>
@@ -337,13 +333,6 @@
     </description>
   </property>
 
-  <property>
-    <name>mapreduce.reduce.memory.mb</name>
-    <value>1024</value>
-    <description>
-      Larger resource limit for reduces.
-    </description>
-  </property>
 
   <property>
     <name>mapreduce.reduce.java.opts</name>

ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -166,11 +166,13 @@
   <property>
     <name>mapreduce.map.memory.mb</name>
     <value>1536</value>
+    <description>Virtual memory for single Map task</description>
   </property>
 
   <property>
     <name>mapreduce.reduce.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Reduce task</description>
   </property>
 
   <property>

ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -166,11 +166,13 @@
   <property>
     <name>mapreduce.map.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Map task</description>
   </property>
 
   <property>
     <name>mapreduce.reduce.memory.mb</name>
     <value>1024</value>
+    <description>Virtual memory for single Reduce task</description>
   </property>
 
   <property>
@@ -321,13 +323,6 @@
     </description>
   </property>
 
-  <property>
-    <name>mapreduce.map.memory.mb</name>
-    <value>1024</value>
-    <description>
-      Larger resource limit for maps.
-    </description>
-  </property>
 
   <property>
     <name>mapreduce.map.java.opts</name>
@@ -337,14 +332,6 @@
     </description>
   </property>
 
-  <property>
-    <name>mapreduce.reduce.memory.mb</name>
-    <value>1024</value>
-    <description>
-      Larger resource limit for reduces.
-    </description>
-  </property>
-
   <property>
     <name>mapreduce.reduce.java.opts</name>
     <value>-Xmx756m</value>

ambari-web/app/data/HDP2/config_mapping.js

@@ -339,20 +339,6 @@ var configs = [
     "value": "<templateName[0]>:10020",
     "filename": "mapred-site.xml"
   },
-  {
-    "name": "mapreduce.map.memory.mb",
-    "templateName": ["mapreduce_map_memory_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapreduce.reduce.memory.mb",
-    "templateName": ["mapreduce_reduce_memory_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
   {
     "name": "mapreduce.task.io.sort.mb",
     "templateName": ["mapreduce_task_io_sort_mb"],

ambari-web/app/data/HDP2/global_properties.js

@@ -455,30 +455,6 @@ module.exports =
       "category": "HistoryServer",
       "index": 0
     },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_map_memory_mb",
-      "displayName": "Default virtual memory for a job's map-task",
-      "description": "Virtual memory for single Map task",
-      "defaultValue": "1536",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_reduce_memory_mb",
-      "displayName": "Default virtual memory for a job's reduce-task",
-      "description": "Virtual memory for single Reduce task",
-      "defaultValue": "2048",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE2"
-    },
     {
       "id": "puppet var",
       "name": "mapreduce_task_io_sort_mb",

ambari-web/app/data/HDP2/site_properties.js

@@ -157,6 +157,30 @@ module.exports =
       "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "mapreduce.map.memory.mb",
+      "displayName": "Default virtual memory for a job's map-task",
+      "description": "Virtual memory for single Map task",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "MB",
+      "category": "General",
+      "serviceName": "MAPREDUCE2"
+    },
+    {
+      "id": "site property",
+      "name": "mapreduce.reduce.memory.mb",
+      "displayName": "Default virtual memory for a job's reduce-task",
+      "description": "Virtual memory for single Reduce task",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "MB",
+      "category": "General",
+      "serviceName": "MAPREDUCE2"
     }
   ]
 };