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/08/30 23:34:59 UTC
git commit: AMBARI-3060: yarn.nodemanager.log-dirs is displayed twice
on yarn service page. (jaimin)
Updated Branches:
refs/heads/trunk 44cc11dfb -> 203b5f9fd
AMBARI-3060: yarn.nodemanager.log-dirs is displayed twice on yarn service page. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/203b5f9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/203b5f9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/203b5f9f
Branch: refs/heads/trunk
Commit: 203b5f9fdb8a418ced7e9ee2f8f86b8755bcfed1
Parents: 44cc11d
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Aug 30 14:34:25 2013 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Aug 30 14:34:37 2013 -0700
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 2 +-
ambari-web/app/data/HDP2/config_mapping.js | 7 -------
ambari-web/app/data/HDP2/global_properties.js | 17 -----------------
ambari-web/app/data/HDP2/site_properties.js | 9 ++++++++-
ambari-web/app/models/service_config.js | 6 +++---
6 files changed, 13 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
index 565a982..b44ac9c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
@@ -141,7 +141,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value></value>
+ <value>/hadoop/yarn</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
index f6bbb9a..2d4c165 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
@@ -141,7 +141,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value></value>
+ <value>/hadoop/yarn</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/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 2ceef1a..18f7673 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -344,13 +344,6 @@ var configs = [
"value": "<templateName[0]>",
"filename": "yarn-site.xml"
},
- {
- "name": "yarn.nodemanager.log-dirs",
- "templateName": ["yarn_nodemanager_log-dirs"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "yarn-site.xml"
- },
/**********************************************mapred-site***************************************/
{
"name": "mapreduce.jobhistory.webapp.address",
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/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 9d770bb..8b27224 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -737,23 +737,6 @@ module.exports =
"serviceName": "YARN",
"category": "Advanced"
},
- {
- "id": "puppet var",
- "name": "yarn_nodemanager_log-dirs",
- "displayName": "yarn.nodemanager.log-dirs",
- "defaultValue": "",
- "description": "Where to store container logs. An application's localized log directory\
- will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.\
- Individual containers' log directories will be below this, in directories\
- named container_{$contid}. Each container directory will contain the files\
- stderr, stdin, and syslog generated by that container.",
- "defaultDirectory": "/hadoop/yarn",
- "displayType": "directories",
- "isReconfigurable": true,
- "isVisible": true,
- "serviceName": "YARN",
- "category": "Advanced"
- },
/**********************************************HBASE***************************************/
{
"id": "puppet var",
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/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 ba2a923..2eb2f4e 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -22,6 +22,7 @@ module.exports =
"id": "site property",
"name": "yarn.acl.enable",
"displayName": "yarn.acl.enable",
+ "displayType": "checkbox",
"value": "",
"defaultValue": "",
"serviceName": "YARN",
@@ -40,6 +41,7 @@ module.exports =
"id": "site property",
"name": "yarn.log-aggregation-enable",
"displayName": "yarn.log-aggregation-enable",
+ "displayType": "checkbox",
"value": "",
"defaultValue": "",
"serviceName": "YARN",
@@ -94,8 +96,13 @@ module.exports =
"id": "site property",
"name": "yarn.nodemanager.log-dirs",
"displayName": "yarn.nodemanager.log-dirs",
- "value": "",
"defaultValue": "",
+ "description": "Where to store container logs. An application's localized log directory\
+ will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.\
+ Individual containers' log directories will be below this, in directories\
+ named container_{$contid}. Each container directory will contain the files\
+ stderr, stdin, and syslog generated by that container.",
+ "defaultDirectory": "/hadoop/yarn",
"displayType": "directories",
"serviceName": "YARN",
"category": "NodeManager"
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/203b5f9f/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 700a8a5..8314d91 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -34,7 +34,7 @@ App.ServiceConfig = Ember.Object.extend({
overrideErrors += 1;
}
})
- })
+ });
var masterErrors = this.get('configs').filterProperty('isValid', false).filterProperty('isVisible', true).get('length');
var slaveErrors = 0;
this.get('configCategories').forEach(function (_category) {
@@ -289,7 +289,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'dfs_data_dir':
case 'dfs_datanode_data_dir':
case 'yarn_nodemanager_local-dirs':
- case 'yarn_nodemanager_log-dirs':
+ case 'yarn.nodemanager.log-dirs':
case 'mapred_local_dir':
case 'mapreduce_cluster_local_dir':
this.unionAllMountPoints(!isOnlyFirstOneNeeded, localDB);
@@ -353,7 +353,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
setOfHostNames.push(host.hostName);
}, this);
break;
- case 'yarn_nodemanager_log-dirs':
+ case 'yarn.nodemanager.log-dirs':
case 'yarn_nodemanager_local-dirs':
temp = slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER');
temp.hosts.forEach(function (host) {