Updated Branches: refs/heads/trunk 3ba75617b -> 0a80b3f25
AMBARI-3467. Some of the mapred-site properties added by web-client are no longer required for MapReduce 2. (jaimin 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/0a80b3f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0a80b3f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0a80b3f2 Branch: refs/heads/trunk Commit: 0a80b3f25e054d875b8c57a64c8eaa27b9d727d3 Parents: 3ba7561 Author: Yusaku Sako <[email protected]> Authored: Sun Oct 6 17:39:58 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Sun Oct 6 17:41:52 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/config_mapping.js | 42 ------------- ambari-web/app/data/HDP2/global_properties.js | 73 ---------------------- ambari-web/app/data/HDP2/site_properties.js | 12 ++++ 3 files changed, 12 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a80b3f2/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 588137d..318ed0e 100644 --- a/ambari-web/app/data/HDP2/config_mapping.js +++ b/ambari-web/app/data/HDP2/config_mapping.js @@ -339,48 +339,6 @@ var configs = [ "value": "<templateName[0]>:10020", "filename": "mapred-site.xml" }, - { - "name": "mapreduce.task.io.sort.mb", - "templateName": ["mapreduce_task_io_sort_mb"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapreduce.jobtracker.system.dir", - "templateName": ["mapreduce_jobtracker_system_dir"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapred.hosts", - "templateName": ["hadoop_conf_dir", "mapred_hosts_include"], - "foreignKey": null, - "value": "<templateName[0]>/<templateName[1]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapred.task.tracker.task-controller", - "templateName": ["task_controller"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapred.hosts.exclude", - "templateName": ["hadoop_conf_dir", "mapred_hosts_exclude"], - "foreignKey": null, - "value": "<templateName[0]>/<templateName[1]>", - "filename": "mapred-site.xml" - }, - { - "name": "mapreduce.tasktracker.healthchecker.script.path", - "templateName": ["mapred_jobstatus_dir"], - "foreignKey": null, - "value": "<templateName[0]>", - "filename": "mapred-site.xml" - }, /**********************************************hbase-site***************************************/ { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a80b3f2/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 0cf3b05..fc2a670 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -457,31 +457,6 @@ module.exports = }, { "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)", - "defaultValue": "200", - "displayType": "int", - "unit": "MB", - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2" - }, - { - "id": "puppet var", - "name": "mapreduce_jobtracker_system_dir", - "displayName": "MapReduce system directories", - "description": "", - "defaultValue": "/mapred/system", - "displayType": "directories", - "isReconfigurable": true, - "isVisible": true, - "domain": "global", - "serviceName": "MAPREDUCE2", - "category": "Advanced" - }, - { - "id": "puppet var", "name": "mapred_log_dir_prefix", "displayName": "Mapreduce Log Dir Prefix", "description": "", @@ -506,54 +481,6 @@ module.exports = "serviceName": "MAPREDUCE2", "category": "Advanced" }, - { - "id": "puppet var", - "name": "mapred_hosts_include", - "displayName": "Include hosts", - "description": "Include enetered hosts", - "defaultValue": "mapred.include", - "displayType": "directories", - "isVisible": false, - "serviceName": "MAPREDUCE2", - "domain": "global", - "category": "Advanced" - }, - { - "id": "puppet var", - "name": "task_controller", - "displayName": "task_controller", - "description": "", - "defaultValue": "org.apache.hadoop.mapred.DefaultTaskController", - "displayType": "advanced", - "isVisible": false, - "serviceName": "MAPREDUCE2", - "domain": "global", - "category": "Advanced" - }, - { - "id": "puppet var", - "name": "mapred_hosts_exclude", - "displayName": "Exclude hosts", - "description": "Exclude entered hosts", - "defaultValue": "mapred.exclude", - "displayType": "directories", - "isVisible": false, - "serviceName": "MAPREDUCE2", - "domain": "global", - "category": "Advanced" - }, - { - "id": "puppet var", - "name": "mapred_jobstatus_dir", - "displayName": "Job Status directory", - "description": "Directory path to view job status", - "defaultValue": "file:////mapred/jobstatus", - "displayType": "advanced", - "isVisible": false, - "serviceName": "MAPREDUCE2", - "domain": "global", - "category": "Advanced" - }, /**********************************************YARN***************************************/ { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a80b3f2/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 56a0bc6..b3c7d85 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -181,6 +181,18 @@ module.exports = "unit": "MB", "category": "General", "serviceName": "MAPREDUCE2" + }, + { + "id": "site property", + "name": "mapreduce.task.io.sort.mb", + "displayName": "Map-side sort buffer memory", + "description": "The total amount of buffer memory to use while sorting files, in megabytes.\ + By default, gives each merge stream 1MB, which should minimize seeks.", + "defaultValue": "", + "displayType": "int", + "unit": "MB", + "category": "General", + "serviceName": "MAPREDUCE2" } ] };
