You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/10/02 23:56:21 UTC
git commit: AMBARI-3434. On 2.x stack,
dfs.block.local-path-access.user should not be set in hdfs-site.
(yusaku)
Updated Branches:
refs/heads/trunk 0328b7c05 -> 501f58020
AMBARI-3434. On 2.x stack, dfs.block.local-path-access.user should not be set in hdfs-site. (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/501f5802
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/501f5802
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/501f5802
Branch: refs/heads/trunk
Commit: 501f58020469580d5c60c0971fbe94b9cccfad32
Parents: 0328b7c
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Oct 2 14:50:54 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Oct 2 14:50:54 2013 -0700
----------------------------------------------------------------------
ambari-web/app/data/HDP2/config_mapping.js | 7 -------
ambari-web/app/data/HDP2/global_properties.js | 13 -------------
ambari-web/app/views/common/configs/services_config.js | 2 +-
3 files changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/501f5802/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 33cee97..aa99939 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -117,13 +117,6 @@ var configs = [
"filename": "hdfs-site.xml"
},
{
- "name": "dfs.block.local-path-access.user",
- "templateName": ["dfs_block_local_path_access_user"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
"name": "dfs.datanode.data.dir",
"templateName": ["dfs_datanode_data_dir"],
"foreignKey": null,
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/501f5802/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 37ac044..ad92b3d 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -360,19 +360,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "dfs_block_local_path_access_user",
- "displayName": "dfs.block.local-path-access.user",
- "description": "the user who is allowed to perform short circuit reads",
- "displayType": "advanced",
- "defaultValue": "hbase",
- "isVisible": true,
- "filename": "hdfs-site.xml",
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
"name": "dfs_datanode_data_dir_perm",
"displayName": "dfs_datanode_data_dir_perm",
"description": "",
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/501f5802/ambari-web/app/views/common/configs/services_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js
index 25d21d4..c49e38c 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/ambari-web/app/views/common/configs/services_config.js
@@ -127,7 +127,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
}
);
}
- } else if (changedProperty.get("name") == "hbase_user") {
+ } else if (changedProperty.get("name") == "hbase_user" && !App.get('isHadoop2Stack')) {
curConfigs = stepConfigs.findProperty("serviceName", "HDFS").get("configs");
if (newValue != curConfigs.findProperty("name", "dfs_block_local_path_access_user").get("value")) {
this.affectedProperties.push(