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/10/03 03:12:08 UTC
git commit: AMBARI-3435: YARN cluster should not have shared
directories between yarn.nodemanager.local-dirs and
yarn.nodemanager.log-dirs. (jaimin)
Updated Branches:
refs/heads/trunk 1b300393d -> ca0414930
AMBARI-3435: YARN cluster should not have shared directories between yarn.nodemanager.local-dirs and yarn.nodemanager.log-dirs. (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/ca041493
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ca041493
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ca041493
Branch: refs/heads/trunk
Commit: ca04149302c42916b2e2c150f9dd0b8b36db9aa2
Parents: 1b30039
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Oct 2 18:11:38 2013 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Oct 2 18:11:46 2013 -0700
----------------------------------------------------------------------
.../2.0.5/services/YARN/configuration/yarn-site.xml | 4 ++--
.../2.0.6/services/YARN/configuration/yarn-site.xml | 4 ++--
.../2.0.5/services/YARN/configuration/yarn-site.xml | 4 ++--
.../2.0.6/services/YARN/configuration/yarn-site.xml | 4 ++--
ambari-web/app/data/HDP2/config_mapping.js | 8 +-------
ambari-web/app/data/HDP2/global_properties.js | 12 ------------
ambari-web/app/data/HDP2/site_properties.js | 16 +++++++++++++++-
ambari-web/app/models/service_config.js | 4 ++--
8 files changed, 26 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/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 b44ac9c..5846756 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>/hadoop/yarn</value>
+ <value>/hadoop/yarn/log</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
@@ -153,7 +153,7 @@
<property>
<name>yarn.nodemanager.local-dirs</name>
- <value></value>
+ <value>/hadoop/yarn/local</value>
<description>
List of directories to store localized files in. An
application's localized file directory will be found in:
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml
index 16482fc..8497b58 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml
@@ -142,7 +142,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value>/hadoop/yarn</value>
+ <value>/hadoop/yarn/log</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
@@ -154,7 +154,7 @@
<property>
<name>yarn.nodemanager.local-dirs</name>
- <value></value>
+ <value>/hadoop/yarn/local</value>
<description>
List of directories to store localized files in. An
application's localized file directory will be found in:
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/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 2d4c165..27d80ab 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>/hadoop/yarn</value>
+ <value>/hadoop/yarn/log</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
@@ -153,7 +153,7 @@
<property>
<name>yarn.nodemanager.local-dirs</name>
- <value></value>
+ <value>/hadoop/yarn/local</value>
<description>
List of directories to store localized files in. An
application's localized file directory will be found in:
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml
index ae09c21..2b37bd0 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml
@@ -142,7 +142,7 @@
<property>
<name>yarn.nodemanager.log-dirs</name>
- <value>/hadoop/yarn</value>
+ <value>/hadoop/yarn/log</value>
<description>
Where to store container logs. An application's localized log directory
will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
@@ -154,7 +154,7 @@
<property>
<name>yarn.nodemanager.local-dirs</name>
- <value></value>
+ <value>/hadoop/yarn/local</value>
<description>
List of directories to store localized files in. An
application's localized file directory will be found in:
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/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 aa99939..bec418c 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -323,13 +323,7 @@ var configs = [
"value": "http://<templateName[0]>:19888/jobhistory/logs",
"filename": "yarn-site.xml"
},
- {
- "name": "yarn.nodemanager.local-dirs",
- "templateName": ["yarn_nodemanager_local-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/ca041493/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 ad92b3d..695a9fc 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -679,18 +679,6 @@ module.exports =
"serviceName": "YARN",
"category": "Advanced"
},
- {
- "id": "puppet var",
- "name": "yarn_nodemanager_local-dirs",
- "displayName": "YARN local directories",
- "defaultValue": "",
- "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/ca041493/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 2eb2f4e..decde13 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -102,7 +102,21 @@ module.exports =
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",
+ "defaultDirectory": "/hadoop/yarn/log",
+ "displayType": "directories",
+ "serviceName": "YARN",
+ "category": "NodeManager"
+ },
+ {
+ "id": "site property",
+ "name": "yarn.nodemanager.local-dirs",
+ "displayName": "yarn.nodemanager.local-dirs",
+ "defaultValue": "",
+ "description": "List of directories to store localized files in.\
+ An application's localized file directory will be found in:\
+ ${yarn.nodemanager.local-dirs}/usercache/${user}/appcache/application_${appid}.\
+ Individual containers' work directories, called container_${contid}, will be subdirectories of this.",
+ "defaultDirectory": "/hadoop/yarn/local",
"displayType": "directories",
"serviceName": "YARN",
"category": "NodeManager"
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ca041493/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 cbbc661..ca462c5 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -287,7 +287,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'dfs_namenode_name_dir':
case 'dfs_data_dir':
case 'dfs_datanode_data_dir':
- case 'yarn_nodemanager_local-dirs':
+ case 'yarn.nodemanager.local-dirs':
case 'yarn.nodemanager.log-dirs':
case 'mapred_local_dir':
case 'mapreduce_cluster_local_dir':
@@ -354,7 +354,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
}, this);
break;
case 'yarn.nodemanager.log-dirs':
- case 'yarn_nodemanager_local-dirs':
+ case 'yarn.nodemanager.local-dirs':
temp = slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER');
temp.hosts.forEach(function (host) {
setOfHostNames.push(host.hostName);