Updated Branches: refs/heads/trunk 0eee1ff3d -> 649e16639
AMBARI-2954. Remove deprecated properties from mapred-site.xml. (Andrii Babiichuk via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/649e1663 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/649e1663 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/649e1663 Branch: refs/heads/trunk Commit: 649e166395c2ccaed545069397167ffdcda8a69a Parents: 0eee1ff Author: Yusaku Sako <[email protected]> Authored: Tue Aug 20 13:29:08 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Tue Aug 20 13:29:08 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/config_mapping.js | 35 ------------- ambari-web/app/data/HDP2/config_properties.js | 61 ---------------------- 2 files changed, 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/649e1663/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 5f3fcc2..bfc17c7 100644 --- a/ambari-web/app/data/HDP2/config_mapping.js +++ b/ambari-web/app/data/HDP2/config_mapping.js @@ -381,13 +381,6 @@ var configs = [ "filename": "mapred-site.xml" }, { - "name": "mapreduce.cluster.reducememory.mb", - "templateName": ["mapreduce_cluster_reducememory_mb"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { "name": "mapred.hosts", "templateName": ["hadoop_conf_dir", "mapred_hosts_include"], "foreignKey": null, @@ -409,13 +402,6 @@ var configs = [ "filename": "mapred-site.xml" }, { - "name": "mapreduce.cluster.local.dir", - "templateName": ["mapreduce_cluster_local_dir"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { "name": "mapred.task.tracker.task-controller", "templateName": ["task_controller"], "foreignKey": null, @@ -437,20 +423,6 @@ var configs = [ "filename": "mapred-site.xml" }, { - "name": "mapred.cluster.max.map.memory.mb", - "templateName": ["mapred_cluster_max_map_mem_mb"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapred.cluster.max.reduce.memory.mb", - "templateName": ["mapred_cluster_max_red_mem_mb"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { "name": "mapred.jobtracker.taskScheduler", "templateName": ["scheduler_name"], "foreignKey": null, @@ -464,13 +436,6 @@ var configs = [ "value": "<templateName[0]>", "filename": "mapred-site.xml" }, - { - "name": "mapred.cluster.map.memory.mb", - "templateName": ["mapred_cluster_map_mem_mb"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, /**********************************************hbase-site***************************************/ { "name": "hbase.rootdir", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/649e1663/ambari-web/app/data/HDP2/config_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/config_properties.js b/ambari-web/app/data/HDP2/config_properties.js index b4c9a57..6f17c57 100644 --- a/ambari-web/app/data/HDP2/config_properties.js +++ b/ambari-web/app/data/HDP2/config_properties.js @@ -458,31 +458,6 @@ module.exports = }, { "id": "puppet var", - "name": "mapreduce_cluster_local_dir", - "displayName": "MapReduce local directories", - "description": "Directories for MapReduce to store intermediate data files", - "defaultValue": "", - "defaultDirectory": "/hadoop/mapred", - "displayType": "directories", - "isReconfigurable": true, - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", - "name": "mapreduce_cluster_reducememory_mb", - "displayName": "Cluster's Reduce slot size (virtual memory)", - "description": "The virtual memory size of a single Reduce slot in the MapReduce framework", - "defaultValue": "2048", - "displayType": "int", - "unit": "MB", - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", "name": "mapreduce_tasktracker_map_tasks_maximum", "displayName": "Number of Map slots per node", "description": "Number of slots that Map tasks that run simultaneously can occupy on a TaskTracker", @@ -553,30 +528,6 @@ module.exports = }, { "id": "puppet var", - "name": "mapred_cluster_max_map_mem_mb", - "displayName": "Upper limit on virtual memory for single Map task", - "description": "Upper limit on virtual memory size for a single Map task of any MapReduce job", - "defaultValue": "6144", - "displayType": "int", - "unit": "MB", - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", - "name": "mapred_cluster_max_red_mem_mb", - "displayName": "Upper limit on virtual memory for single Reduce task", - "description": "Upper limit on virtual memory size for a single Reduce task of any MapReduce job", - "defaultValue": "4096", - "displayType": "int", - "unit": "MB", - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", "name": "scheduler_name", "displayName": "MapReduce Capacity Scheduler", "description": "The scheduler to use for scheduling of MapReduce jobs", @@ -588,18 +539,6 @@ module.exports = }, { "id": "puppet var", - "name": "mapred_cluster_map_mem_mb", - "displayName": "Cluster's Map slot size (virtual memory)", - "description": "The virtual memory size of a single Map slot in the MapReduce framework", - "defaultValue": "1536", - "displayType": "int", - "unit": "MB", - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", "name": "mapreduce_jobtracker_system_dir", "displayName": "MapReduce system directories", "description": "",
