Browse Source

Revert "AMBARI-3028. container logs are being deleted after the job finishes. (mahadev)"

This reverts commit 2f782bd7c71758a786363198ec8b40b2d49de693.
Mahadev Konar 11 years ago
parent
commit
08484a0a99

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -231,7 +231,7 @@
 
   <property>
     <name>yarn.nodemanager.delete.debug-delay-sec</name>
-    <value>36000</value>
+    <value>0</value>
     <description>
       Number of seconds after an application finishes before the nodemanager's
       DeletionService will delete the application's localized file directory

+ 13 - 12
ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -21,7 +21,7 @@
 
 <configuration xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<!-- ResourceManager -->
+  <!-- ResourceManager -->
 
   <property>
     <name>yarn.resourcemanager.resource-tracker.address</name>
@@ -33,7 +33,7 @@
     <value>localhost:8030</value>
     <description>The address of the scheduler interface.</description>
   </property>
-  
+
   <property>
     <name>yarn.resourcemanager.address</name>
     <value>localhost:8050</value>
@@ -50,8 +50,8 @@
   </property>
 
   <property>
-   <name>yarn.resourcemanager.scheduler.class</name>
-   <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
+    <name>yarn.resourcemanager.scheduler.class</name>
+    <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
     <description>The class to use as the resource scheduler.</description>
   </property>
 
@@ -85,7 +85,7 @@
     <value>*</value>
   </property>
 
-<!-- NodeManager -->
+  <!-- NodeManager -->
 
   <property>
     <name>yarn.nodemanager.address</name>
@@ -103,19 +103,19 @@
   <property>
     <name>yarn.application.classpath</name>
     <value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value>
-  <description>Classpath for typical applications.</description>
+    <description>Classpath for typical applications.</description>
   </property>
 
   <property>
     <name>yarn.nodemanager.vmem-pmem-ratio</name>
     <value>2.1</value>
     <description>Ratio between virtual memory to physical memory when
-    setting memory limits for containers. Container allocations are
-    expressed in terms of physical memory, and virtual memory usage
-    is allowed to exceed this allocation by this ratio.
+      setting memory limits for containers. Container allocations are
+      expressed in terms of physical memory, and virtual memory usage
+      is allowed to exceed this allocation by this ratio.
     </description>
   </property>
-  
+
   <property>
     <name>yarn.nodemanager.container-executor.class</name>
     <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
@@ -127,7 +127,7 @@
     <value>hadoop</value>
     <description>Unix group of the NodeManager</description>
   </property>
- 
+
   <property>
     <name>yarn.nodemanager.aux-services</name>
     <value>mapreduce.shuffle</value>
@@ -231,7 +231,7 @@
 
   <property>
     <name>yarn.nodemanager.delete.debug-delay-sec</name>
-    <value>36000</value>
+    <value>0</value>
     <description>
       Number of seconds after an application finishes before the nodemanager's
       DeletionService will delete the application's localized file directory
@@ -308,4 +308,5 @@
     </description>
   </property>
 
+
 </configuration>