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/27 03:25:44 UTC
git commit: AMBARI-3032: yarn.nodemanager.log-dirs should have a
default value depending upon available free space on mountpoints. (jaimin)
Updated Branches:
refs/heads/branch-1.4 7ad113ed4 -> 0f7998be6
AMBARI-3032: yarn.nodemanager.log-dirs should have a default value depending upon available free space on mountpoints. (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/0f7998be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0f7998be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0f7998be
Branch: refs/heads/branch-1.4
Commit: 0f7998be621e60fc019a9fc0749cd266d355d227
Parents: 7ad113e
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Aug 26 18:24:52 2013 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Aug 26 18:24:52 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/config_properties.js | 17 +++++++++++++++++
ambari-web/app/models/service_config.js | 2 ++
5 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0f7998be/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 32f2413..268c90f 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
@@ -131,7 +131,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value>/var/log/hadoop/yarn</value>
+ <value></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/0f7998be/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 e8a8278..3d64f6f 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
@@ -131,7 +131,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value>/var/log/hadoop/yarn</value>
+ <value></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/0f7998be/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 d08b85e..8758323 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -344,6 +344,13 @@ 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/0f7998be/ambari-web/app/data/HDP2/config_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_properties.js b/ambari-web/app/data/HDP2/config_properties.js
index f76a174..e6638fd 100644
--- a/ambari-web/app/data/HDP2/config_properties.js
+++ b/ambari-web/app/data/HDP2/config_properties.js
@@ -748,6 +748,23 @@ 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/0f7998be/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 3ec1f51..254ee18 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -289,6 +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 'mapred_local_dir':
case 'mapreduce_cluster_local_dir':
this.unionAllMountPoints(!isOnlyFirstOneNeeded, localDB);
@@ -352,6 +353,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
setOfHostNames.push(host.hostName);
}, this);
break;
+ case 'yarn_nodemanager_log-dirs':
case 'yarn_nodemanager_local-dirs':
temp = slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER');
temp.hosts.forEach(function (host) {