You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/10/05 02:15:17 UTC
git commit: AMBARI-3464: Mapred map and reduce memory properties need
to be picked from stack. (jaimin)
Updated Branches:
refs/heads/trunk 03e550012 -> 06ee3b3fc
AMBARI-3464: Mapred map and reduce memory properties need to be picked from stack. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/06ee3b3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/06ee3b3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/06ee3b3f
Branch: refs/heads/trunk
Commit: 06ee3b3fccf70b018ae69deff071ab985f287429
Parents: 03e5500
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Oct 4 17:14:47 2013 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Oct 4 17:14:53 2013 -0700
----------------------------------------------------------------------
.../hdp-pig/manifests/pig/service_check.pp | 2 +-
.../MAPREDUCE2/configuration/mapred-site.xml | 2 ++
.../MAPREDUCE2/configuration/mapred-site.xml | 17 +++-----------
.../MAPREDUCE2/configuration/mapred-site.xml | 2 ++
.../MAPREDUCE2/configuration/mapred-site.xml | 17 ++------------
ambari-web/app/data/HDP2/config_mapping.js | 14 ------------
ambari-web/app/data/HDP2/global_properties.js | 24 --------------------
ambari-web/app/data/HDP2/site_properties.js | 24 ++++++++++++++++++++
8 files changed, 34 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/pig/service_check.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/pig/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/pig/service_check.pp
index 89abcfa..a56739a 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/pig/service_check.pp
+++ b/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':}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
index 2921a95..0fecca1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
index 0c99dc1..424d216 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
index 3844558..6ed35f1 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
index 096c3a7..de11867 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml
+++ b/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>
@@ -338,14 +333,6 @@
</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>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
index f9620d9..588137d 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -340,20 +340,6 @@ var configs = [
"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"],
"foreignKey": null,
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 92119db..0cf3b05 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -457,30 +457,6 @@ module.exports =
},
{
"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",
"displayName": "Map-side sort buffer memory",
"description": "The total amount of Map-side buffer memory to use while sorting files (Expert-only configuration)",
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06ee3b3f/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index decde13..56a0bc6 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/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"
}
]
};