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

YARN-1760. TestRMAdminService assumes CapacityScheduler. (kasha) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571778 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-02-25 18:16:04 +00:00
parent 596a196c1c
commit d4b882d09f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,8 @@ Release 2.4.0 - UNRELEASED
transits from standby to active mode so as to assimilate any changes that
happened while it was in standby mode. (Xuan Gong via vinodkv)
YARN-1760. TestRMAdminService assumes CapacityScheduler. (kasha)
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES

12
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
View File

@ -62,7 +62,7 @@ import org.junit.Test;
public class TestRMAdminService {
private final Configuration configuration = new YarnConfiguration();
private Configuration configuration;;
private MockRM rm = null;
private FileSystem fs;
private Path workingPath;
@ -70,7 +70,7 @@ public class TestRMAdminService {
@Before
public void setup() throws IOException {
Configuration.addDefaultResource(YarnConfiguration.CS_CONFIGURATION_FILE);
configuration = new YarnConfiguration();
fs = FileSystem.get(configuration);
workingPath =
new Path(new File("target", this.getClass().getSimpleName()
@ -94,9 +94,16 @@ public class TestRMAdminService {
fs.delete(tmpDir, true);
}
private void useCapacityScheduler() {
configuration.set(YarnConfiguration.RM_SCHEDULER,
CapacityScheduler.class.getCanonicalName());
configuration.addResource(YarnConfiguration.CS_CONFIGURATION_FILE);
}
@Test
public void testAdminRefreshQueuesWithLocalConfigurationProvider()
throws IOException, YarnException {
useCapacityScheduler();
rm = new MockRM(configuration);
rm.init(configuration);
rm.start();
@ -119,6 +126,7 @@ public class TestRMAdminService {
throws IOException, YarnException {
configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS,
"org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider");
useCapacityScheduler();
try {
rm = new MockRM(configuration);
rm.init(configuration);