diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java index e67b81f..371510e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java @@ -58,7 +58,7 @@ public class TestRMAdminService { - private final Configuration configuration = new YarnConfiguration(); + private Configuration configuration;; private MockRM rm = null; private FileSystem fs; private Path workingPath; @@ -66,7 +66,7 @@ @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() @@ -90,9 +90,16 @@ public void tearDown() throws IOException { 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(); @@ -115,6 +122,7 @@ public void testAdminRefreshQueuesWithFileSystemBasedConfigurationProvider() throws IOException, YarnException { configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS, "org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider"); + useCapacityScheduler(); try { rm = new MockRM(configuration); rm.init(configuration);