incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-3032: yarn.nodemanager.log-dirs should have a default value depending upon available free space on mountpoints. (jaimin)
Date Tue, 27 Aug 2013 01:26:40 GMT
Updated Branches:
  refs/heads/trunk 08484a0a9 -> e980f7e5a


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/e980f7e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/e980f7e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/e980f7e5

Branch: refs/heads/trunk
Commit: e980f7e5ae16a651f6da2e4cad87bf708cbdfeb0
Parents: 08484a0
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Mon Aug 26 18:24:52 2013 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Mon Aug 26 18:26:21 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/models/service_config.js            |  2 ++
 5 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e980f7e5/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 609dcfe..565a982 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>/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/e980f7e5/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 4e686ad..f6bbb9a 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>/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/e980f7e5/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/e980f7e5/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 7ef2cca..4afafba 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_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/e980f7e5/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 130401c..700a8a5 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) {


Mime
View raw message