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/12/18 03:04:18 UTC
git commit: AMBARI-4097. Undo port customization code on
branch-1.4.3. (jaimin)
Updated Branches:
refs/heads/branch-1.4.3 a468ed498 -> 56004f080
AMBARI-4097. Undo port customization code on branch-1.4.3. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56004f08
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56004f08
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56004f08
Branch: refs/heads/branch-1.4.3
Commit: 56004f08035235c609ddd834f795ff770dccb73c
Parents: a468ed4
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Dec 17 18:03:44 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Dec 17 18:03:44 2013 -0800
----------------------------------------------------------------------
.../services/HDFS/configuration/hdfs-site.xml | 19 ++-----------------
.../services/HDFS/configuration/hdfs-site.xml | 19 ++-----------------
.../services/HDFS/configuration/hdfs-site.xml | 20 ++------------------
.../services/HDFS/configuration/hdfs-site.xml | 20 ++------------------
.../controllers/main/admin/security/disable.js | 8 ++++----
ambari-web/app/data/HDP2/secure_mapping.js | 8 ++++----
ambari-web/app/data/secure_mapping.js | 8 ++++----
7 files changed, 20 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/56004f08/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/56004f08/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
index ac76122..00cc820 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
@@ -150,33 +150,18 @@
</description>
</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/56004f08/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 fc292e6..1a35848 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
@@ -181,32 +181,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/56004f08/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
index 7e8bfba..36376f5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
@@ -181,32 +181,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/56004f08/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/56004f08/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/56004f08/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"
},