Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531423 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2013-10-11 21:18:48 +00:00
parent 1d07c5cf17
commit 156b9f2e88
4 changed files with 44 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml
View File

@ -1,50 +0,0 @@
<?xml version="1.0"?>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<!--
This file contains pool and user allocations for the Fair Scheduler.
Its format is explained in the Fair Scheduler documentation at
http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html
The documentation also includes a sample config file.
-->
<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>

53
hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
View File

@ -20,28 +20,31 @@
The documentation also includes a sample config file. The documentation also includes a sample config file.
--> -->
<configuration> <allocations>
<property> <user name="jenkins">
<description>Absolute path to allocation file. An allocation file is an XML <!-- Limit on running jobs for the user across all pools. If more
manifest describing queues and their properties, in addition to certain jobs than this are submitted, only the first <maxRunningJobs> will
policy defaults. This file must be in XML format as described in be scheduled at any given time. Defaults to infinity or the
http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html. userMaxJobsDefault value set below. -->
</description> <maxRunningJobs>1000</maxRunningJobs>
<name>yarn.scheduler.fair.allocation.file</name> </user>
<value>src/test/resources/fair-scheduler-allocation.xml</value> <userMaxAppsDefault>1000</userMaxAppsDefault>
</property> <queue name="sls_queue_1">
<minResources>1024 mb, 1 vcores</minResources>
<property> <schedulingMode>fair</schedulingMode>
<description>Whether to use preemption. Note that preemption is experimental <weight>0.25</weight>
in the current version. Defaults to false.</description> <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
<name>yarn.scheduler.fair.preemption</name> </queue>
<value>true</value> <queue name="sls_queue_2">
</property> <minResources>1024 mb, 1 vcores</minResources>
<schedulingMode>fair</schedulingMode>
<property> <weight>0.25</weight>
<description>Whether to allow multiple container assignments in one <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
heartbeat. Defaults to false.</description> </queue>
<name>yarn.scheduler.fair.assignmultiple</name> <queue name="sls_queue_3">
<value>true</value> <minResources>1024 mb, 1 vcores</minResources>
</property> <weight>0.5</weight>
</configuration> <schedulingMode>fair</schedulingMode>
<minSharePreemptionTimeout>2</minSharePreemptionTimeout>
</queue>
</allocations>

13
hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
View File

@ -55,4 +55,17 @@
<value>false</value> <value>false</value>
</property> </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> </configuration>

3
hadoop-yarn-project/CHANGES.txt
View File

@ -78,6 +78,9 @@ Release 2.3.0 - UNRELEASED
YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza) YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)
YARN-1300. SLS tests fail because conf puts YARN properties in
fair-scheduler.xml (Ted Yu via Sandy Ryza)
Release 2.2.1 - UNRELEASED Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES