You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sa...@apache.org on 2013/10/11 23:28:42 UTC
svn commit: r1531427 - in
/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources:
fair-scheduler-allocation.xml fair-scheduler.xml yarn-site.xml
Author: sandy
Date: Fri Oct 11 21:28:41 2013
New Revision: 1531427
URL: http://svn.apache.org/r1531427
Log:
YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza)
Removed:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml?rev=1531427&r1=1531426&r2=1531427&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml Fri Oct 11 21:28:41 2013
@@ -20,28 +20,31 @@
The documentation also includes a sample config file.
-->
-<configuration>
- <property>
- <description>Absolute path to allocation file. An allocation file is an XML
- manifest describing queues and their properties, in addition to certain
- policy defaults. This file must be in XML format as described in
- http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html.
- </description>
- <name>yarn.scheduler.fair.allocation.file</name>
- <value>src/test/resources/fair-scheduler-allocation.xml</value>
- </property>
-
- <property>
- <description>Whether to use preemption. Note that preemption is experimental
- in the current version. Defaults to false.</description>
- <name>yarn.scheduler.fair.preemption</name>
- <value>true</value>
- </property>
-
- <property>
- <description>Whether to allow multiple container assignments in one
- heartbeat. Defaults to false.</description>
- <name>yarn.scheduler.fair.assignmultiple</name>
- <value>true</value>
- </property>
-</configuration>
+<allocations>
+ <user name="jenkins">
+ <!-- Limit on running jobs for the user across all pools. If more
+ jobs than this are submitted, only the first <maxRunningJobs> will
+ be scheduled at any given time. Defaults to infinity or the
+ userMaxJobsDefault value set below. -->
+ <maxRunningJobs>1000</maxRunningJobs>
+ </user>
+ <userMaxAppsDefault>1000</userMaxAppsDefault>
+ <queue name="sls_queue_1">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <schedulingMode>fair</schedulingMode>
+ <weight>0.25</weight>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+ <queue name="sls_queue_2">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <schedulingMode>fair</schedulingMode>
+ <weight>0.25</weight>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+ <queue name="sls_queue_3">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <weight>0.5</weight>
+ <schedulingMode>fair</schedulingMode>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+</allocations>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml?rev=1531427&r1=1531426&r2=1531427&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml Fri Oct 11 21:28:41 2013
@@ -55,4 +55,17 @@
<value>false</value>
</property>
+ <property>
+ <description>Whether to use preemption. Note that preemption is experimental
+ in the current version. Defaults to false.</description>
+ <name>yarn.scheduler.fair.preemption</name>
+ <value>true</value>
+ </property>
+
+ <property>
+ <description>Whether to allow multiple container assignments in one
+ heartbeat. Defaults to false.</description>
+ <name>yarn.scheduler.fair.assignmultiple</name>
+ <value>true</value>
+ </property>
</configuration>