Index: hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml =================================================================== --- hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml (revision 1531366) +++ hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml (working copy) @@ -1,50 +0,0 @@ - - - - - - - - - 1000 - - 1000 - - 1024 mb, 1 vcores - fair - 0.25 - 2 - - - 1024 mb, 1 vcores - fair - 0.25 - 2 - - - 1024 mb, 1 vcores - 0.5 - fair - 2 - - Index: hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml =================================================================== --- hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml (revision 1531366) +++ hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml (working copy) @@ -55,4 +55,17 @@ false + + Whether to use preemption. Note that preemption is experimental + in the current version. Defaults to false. + yarn.scheduler.fair.preemption + true + + + + Whether to allow multiple container assignments in one + heartbeat. Defaults to false. + yarn.scheduler.fair.assignmultiple + true + Index: hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml =================================================================== --- hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml (revision 1531366) +++ hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml (working copy) @@ -20,28 +20,31 @@ The documentation also includes a sample config file. --> - - - 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. - - yarn.scheduler.fair.allocation.file - src/test/resources/fair-scheduler-allocation.xml - - - - Whether to use preemption. Note that preemption is experimental - in the current version. Defaults to false. - yarn.scheduler.fair.preemption - true - - - - Whether to allow multiple container assignments in one - heartbeat. Defaults to false. - yarn.scheduler.fair.assignmultiple - true - - + + + + 1000 + + 1000 + + 1024 mb, 1 vcores + fair + 0.25 + 2 + + + 1024 mb, 1 vcores + fair + 0.25 + 2 + + + 1024 mb, 1 vcores + 0.5 + fair + 2 + +