Procházet zdrojové kódy

AMBARI-3032: yarn.nodemanager.log-dirs should have a default value depending upon available free space on mountpoints. (jaimin)

Jaimin Jetly před 11 roky
rodič
revize
e980f7e5ae

+ 1 - 1
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}.

+ 1 - 1
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}.

+ 7 - 0
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",

+ 17 - 0
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",

+ 2 - 0
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) {