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 2014/02/21 01:59:43 UTC
git commit: AMBARI-4773. Remove redirection in config values to just
ambari known properties. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 3682c9014 -> d91a9dc82
AMBARI-4773. Remove redirection in config values to just ambari known properties. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d91a9dc8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d91a9dc8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d91a9dc8
Branch: refs/heads/trunk
Commit: d91a9dc82e6c10f6399ef4f3d59f75a9f35a25eb
Parents: 3682c90
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Feb 20 16:58:55 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Feb 20 16:59:03 2014 -0800
----------------------------------------------------------------------
.../services/HDFS/configuration/hdfs-site.xml | 19 ++-----------------
.../MAPREDUCE/configuration/mapred-site.xml | 8 +-------
.../services/NAGIOS/package/scripts/params.py | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 20 ++------------------
.../services/NAGIOS/package/scripts/params.py | 2 +-
.../controllers/main/admin/security/disable.js | 8 ++++----
ambari-web/app/data/HDP2/secure_mapping.js | 8 ++++----
ambari-web/app/data/secure_mapping.js | 8 ++++----
ambari-web/app/data/site_properties.js | 5 ++---
9 files changed, 21 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml
index 1fc6c59..9146a06 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml
@@ -151,32 +151,17 @@
</property>
<property>
- <name>ambari.dfs.datanode.port</name>
- <value>50010</value>
- <description>
- The datanode port for data transfer. This property is effective only if referenced from dfs.datanode.address property.
- </description>
- </property>
-
- <property>
<name>dfs.datanode.address</name>
- <value>0.0.0.0:${ambari.dfs.datanode.port}</value>
+ <value>0.0.0.0:50010</value>
<description>
The datanode server address and port for data transfer.
</description>
</property>
- <property>
- <name>ambari.dfs.datanode.http.port</name>
- <value>50075</value>
- <description>
- The datanode http port. This property is effective only if referenced from dfs.datanode.http.address property.
- </description>
- </property>
<property>
<name>dfs.datanode.http.address</name>
- <value>0.0.0.0:${ambari.dfs.datanode.http.port}</value>
+ <value>0.0.0.0:50075</value>
<description>
The datanode http server address and port.
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
index bb54a93..7255ca3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
@@ -285,14 +285,8 @@
</property>
<property>
- <name>ambari.mapred.child.java.opts.memory</name>
- <value>768</value>
- <description>Java options Memory for the TaskTracker child processes</description>
- </property>
-
- <property>
<name>mapred.child.java.opts</name>
- <value>-server -Xmx${ambari.mapred.child.java.opts.memory}m -Djava.net.preferIPv4Stack=true</value>
+ <value>-server -Xmx768m -Djava.net.preferIPv4Stack=true</value>
<description>Java options for the TaskTracker child processes</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index d02be61..5e0942e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -60,7 +60,7 @@ rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resource
nm_port = "8042"
hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.history.server.http.address'])
journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
-datanode_port = config['configurations']['hdfs-site']['ambari.dfs.datanode.http.port']
+datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
flume_port = "4159"
hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
index 296b0c1..d7b37c4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
@@ -182,32 +182,16 @@
</property>
<property>
- <name>ambari.dfs.datanode.port</name>
- <value>50010</value>
- <description>
- The datanode port for data transfer. This property is effective only if referenced from dfs.datanode.address property.
- </description>
- </property>
-
- <property>
<name>dfs.datanode.address</name>
- <value>0.0.0.0:${ambari.dfs.datanode.port}</value>
+ <value>0.0.0.0:50010</value>
<description>
The datanode server address and port for data transfer.
</description>
</property>
<property>
- <name>ambari.dfs.datanode.http.port</name>
- <value>50075</value>
- <description>
- The datanode http port. This property is effective only if referenced from dfs.datanode.http.address property.
- </description>
- </property>
-
- <property>
<name>dfs.datanode.http.address</name>
- <value>0.0.0.0:${ambari.dfs.datanode.http.port}</value>
+ <value>0.0.0.0:50075</value>
<description>
The datanode http server address and port.
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 0f2b90f..96c60a7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -60,7 +60,7 @@ rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resource
nm_port = "8042"
hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.jobhistory.webapp.address'])
journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
-datanode_port = config['configurations']['hdfs-site']['ambari.dfs.datanode.http.port']
+datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
flume_port = "4159"
hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-web/app/controllers/main/admin/security/disable.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/disable.js b/ambari-web/app/controllers/main/admin/security/disable.js
index aa9756b..1f15afa 100644
--- a/ambari-web/app/controllers/main/admin/security/disable.js
+++ b/ambari-web/app/controllers/main/admin/security/disable.js
@@ -104,11 +104,11 @@ App.MainAdminSecurityDisableController = App.MainAdminSecurityProgressController
var configName = _config.name;
if (configName in _serviceConfigTags.configs) {
switch (configName) {
- case 'ambari.dfs.datanode.port':
- _serviceConfigTags.configs[configName] = '50010';
+ case 'dfs.datanode.address':
+ _serviceConfigTags.configs[configName] = '0.0.0.0:50010';
break;
- case 'ambari.dfs.datanode.http.port':
- _serviceConfigTags.configs[configName] = '50075';
+ case 'dfs.datanode.http.address':
+ _serviceConfigTags.configs[configName] = '0.0.0.0:50075';
break;
case 'mapred.task.tracker.task-controller':
_serviceConfigTags.configs[configName] = 'org.apache.hadoop.mapred.DefaultTaskController';
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-web/app/data/HDP2/secure_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js b/ambari-web/app/data/HDP2/secure_mapping.js
index 47be31c..421cf06 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -146,18 +146,18 @@ module.exports = [
"serviceName": "HDFS"
},
{
- "name": "ambari.dfs.datanode.port",
+ "name": "dfs.datanode.address",
"templateName": ["dfs_datanode_address"],
"foreignKey": null,
- "value": "<templateName[0]>",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml",
"serviceName": "HDFS"
},
{
- "name": "ambari.dfs.datanode.http.port",
+ "name": "dfs.datanode.http.address",
"templateName": ["dfs_datanode_http_address"],
"foreignKey": null,
- "value": "<templateName[0]>",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml",
"serviceName": "HDFS"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-web/app/data/secure_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/secure_mapping.js b/ambari-web/app/data/secure_mapping.js
index 2dacffb..8fb49eb 100644
--- a/ambari-web/app/data/secure_mapping.js
+++ b/ambari-web/app/data/secure_mapping.js
@@ -123,18 +123,18 @@ module.exports = [
"serviceName": "HDFS"
},
{
- "name": "ambari.dfs.datanode.port",
+ "name": "dfs.datanode.address",
"templateName": ["dfs_datanode_address"],
"foreignKey": null,
- "value": "<templateName[0]>",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml",
"serviceName": "HDFS"
},
{
- "name": "ambari.dfs.datanode.http.port",
+ "name": "dfs.datanode.http.address",
"templateName": ["dfs_datanode_http_address"],
"foreignKey": null,
- "value": "<templateName[0]>",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml",
"serviceName": "HDFS"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d91a9dc8/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index 999fcae..8e9546c 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -336,12 +336,11 @@ module.exports =
},
{
"id": "site property",
- "name": "ambari.mapred.child.java.opts.memory",
+ "name": "mapred.child.java.opts",
"displayName": "Java options for MapReduce tasks",
"description": "Java options for the TaskTracker child processes.",
"defaultValue": "",
- "displayType": "int",
- "unit": "MB",
+ "displayType": "advanced",
"category": "TaskTracker",
"serviceName": "MAPREDUCE",
"index": 4