diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 7cbf125..dccbe23 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; import java.io.IOException; import java.io.StringReader; @@ -49,6 +50,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.security.QueueACLsManager; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState; @@ -93,6 +95,8 @@ private Injector injector; private String webserviceUserName = "testuser"; + private boolean setAuthFilter = false; + public class GuiceServletConfig extends GuiceServletContextListener { @Override @@ -131,7 +135,6 @@ protected Properties getConfiguration(String configPrefix, private class TestServletModule extends ServletModule { public Configuration conf = new Configuration(); - boolean setAuthFilter = false; @Override protected void configureServlets() { @@ -157,6 +160,7 @@ private Injector getNoAuthInjector() { return Guice.createInjector(new TestServletModule() { @Override protected void configureServlets() { + setAuthFilter = false; super.configureServlets(); } }); @@ -205,7 +209,7 @@ public TestRMWebServicesAppsModification(int run) { } private boolean isAuthorizationEnabled() { - return rm.getConfig().getBoolean(YarnConfiguration.YARN_ACL_ENABLE, false); + return setAuthFilter; } private WebResource constructWebResource(WebResource r, String... paths) { @@ -426,6 +430,11 @@ protected static void verifyAppStateXML(ClientResponse response, @Test(timeout = 30000) public void testSingleAppKillUnauthorized() throws Exception { + boolean isCapacityScheduler = + rm.getResourceScheduler() instanceof CapacityScheduler; + assumeTrue("Currently this test is only supported on CapacityScheduler", + isCapacityScheduler); + // default root queue allows anyone to have admin acl CapacitySchedulerConfiguration csconf = new CapacitySchedulerConfiguration();