Updated Branches: refs/heads/branch-1.4 b8a025576 -> 7ad113ed4
Revert "AMBARI-3028. container logs are being deleted after the job finishes. (mahadev)" This reverts commit 40fff72563cdf8ba8d4cb3a5472b570ded3ca74c. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7ad113ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7ad113ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7ad113ed Branch: refs/heads/branch-1.4 Commit: 7ad113ed4ceeb8ac25715b00d0421cfe2c5c1386 Parents: b8a0255 Author: Mahadev Konar <[email protected]> Authored: Mon Aug 26 17:30:33 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Mon Aug 26 17:30:33 2013 -0700 ---------------------------------------------------------------------- .../services/YARN/configuration/yarn-site.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 25 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7ad113ed/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 eaa818f..32f2413 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 @@ -221,7 +221,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 http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7ad113ed/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 eaa818f..e8a8278 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 @@ -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> @@ -75,7 +75,7 @@ </description> </property> -<!-- NodeManager --> + <!-- NodeManager --> <property> <name>yarn.nodemanager.address</name> @@ -93,19 +93,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> @@ -117,7 +117,7 @@ <value>hadoop</value> <description>Unix group of the NodeManager</description> </property> - + <property> <name>yarn.nodemanager.aux-services</name> <value>mapreduce.shuffle</value> @@ -221,7 +221,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 @@ -298,4 +298,5 @@ </description> </property> + </configuration>
