YARN-7657. Queue Mapping could provide options to provide 'user' specific auto-created queues under a specified group parent queue. (Suma Shivaprasad via wangda)
Change-Id: I32d566e8727840e43c0d66e39a77edef017e3a83 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b167d607 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b167d607 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b167d607 Branch: refs/heads/trunk Commit: b167d60763f4b9ac69976df2da5d988e5faa85e0 Parents: a5b27b3 Author: Wangda Tan <wan...@apache.org> Authored: Tue Mar 13 17:55:51 2018 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Tue Mar 13 17:55:51 2018 -0700 ---------------------------------------------------------------------- .../UserGroupMappingPlacementRule.java | 7 +++ .../server/resourcemanager/TestAppManager.java | 4 +- .../TestUserGroupMappingPlacementRule.java | 21 +++++++++ .../capacity/TestCapacityScheduler.java | 34 ++++++++++++++ ...stCapacitySchedulerAutoCreatedQueueBase.java | 47 ++++++++++++++++++-- .../TestCapacitySchedulerAutoQueueCreation.java | 43 ++++++++++++------ .../TestQueueManagementDynamicEditPolicy.java | 4 +- 7 files changed, 139 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java index d03b832..1f95a59 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java @@ -104,6 +104,10 @@ public class UserGroupMappingPlacementRule extends PlacementRule { return parentQueue; } + public boolean hasParentQueue() { + return parentQueue != null; + } + public MappingType getType() { return type; } @@ -164,6 +168,9 @@ public class UserGroupMappingPlacementRule extends PlacementRule { if (mapping.type == MappingType.GROUP) { for (String userGroups : groups.getGroups(user)) { if (userGroups.equals(mapping.source)) { + if (mapping.queue.equals(CURRENT_USER_MAPPING)) { + return getPlacementContext(mapping, user); + } return getPlacementContext(mapping); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 7c2ce64..1a1b527 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -410,12 +410,12 @@ public class TestAppManager{ new ClientToAMTokenSecretManagerInRM(), newMockRMContext.getScheduler(), masterService, new ApplicationACLsManager(conf), conf); - //only user test has permission to submit to 'test' queue + //only user test has permission to submit to 'user1' queue newAppMonitor.submitApplication(asContext, "user1"); try { //should fail since user does not have permission to submit to queue - // 'test' + // 'managedparent' asContext.setApplicationId(appId = MockApps.newAppID(2)); newAppMonitor.submitApplication(asContext, "user2"); } catch (YarnException e) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java old mode 100644 new mode 100755 index 864acc3..a6143ba --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java @@ -85,5 +85,26 @@ public class TestUserGroupMappingPlacementRule { // if overwritten not specified, it should be which user specified verifyQueueMapping(new QueueMapping(MappingType.USER, "user", "q1"), "user", "q2", "q2", false); + + // if overwritten not specified, it should be which user specified + verifyQueueMapping(new QueueMapping(MappingType.GROUP, "usergroup", + "%user", "usergroup"), + "user", "default", "user", false); + + // if overwritten not specified, it should be which user specified + verifyQueueMapping(new QueueMapping(MappingType.GROUP, "usergroup", + "%user", "usergroup"), + "user", "agroup", "user", true); + + //If user specific queue is enabled for a specified group under a given + // parent queue + verifyQueueMapping(new QueueMapping(MappingType.GROUP, "agroup", + "%user", "parent1"), + "a", "a"); + + //If user specific queue is enabled for a specified group without parent + // queue + verifyQueueMapping(new QueueMapping(MappingType.GROUP, "agroup", "%user"), + "a", "a"); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java index 7764ac8..0fa5c15 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java @@ -43,8 +43,11 @@ import java.util.concurrent.CyclicBarrier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.net.NetworkTopology; import org.apache.hadoop.security.Credentials; +import org.apache.hadoop.security.ShellBasedUnixGroupsMapping; +import org.apache.hadoop.security.TestGroupsCaching; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; @@ -102,6 +105,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.TestAMAuthorization.MockRMW import org.apache.hadoop.yarn.server.resourcemanager.TestAMAuthorization.MyContainerManager; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.NullRMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; + +import org.apache.hadoop.yarn.server.resourcemanager.placement + .UserGroupMappingPlacementRule; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppMetrics; @@ -4722,6 +4728,34 @@ public class TestCapacityScheduler extends CapacitySchedulerTestBase { rm.stop(); } + + @Test + public void testQueueMappingWithCurrentUserQueueMappingForaGroup() throws + Exception { + + CapacitySchedulerConfiguration config = + new CapacitySchedulerConfiguration(); + config.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, + ResourceScheduler.class); + setupQueueConfiguration(config); + + config.setClass(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, + TestGroupsCaching.FakeunPrivilegedGroupMapping.class, ShellBasedUnixGroupsMapping.class); + config.set(CommonConfigurationKeys.HADOOP_USER_GROUP_STATIC_OVERRIDES, + "a1" +"=" + "agroup" + ""); + config.set(CapacitySchedulerConfiguration.QUEUE_MAPPING, + "g:agroup:%user"); + + MockRM rm = new MockRM(config); + rm.start(); + CapacityScheduler cs = ((CapacityScheduler) rm.getResourceScheduler()); + cs.start(); + + RMApp app = rm.submitApp(GB, "appname", "a1", null, "default"); + List<ApplicationAttemptId> appsInA1 = cs.getAppsInQueue("a1"); + assertEquals(1, appsInA1.size()); + } + @Test(timeout = 30000) public void testcheckAndGetApplicationLifetime() throws Exception { long maxLifetime = 10; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java index d8d71c7..6c6ac20 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java @@ -22,6 +22,10 @@ import com.google.common.collect.ImmutableSet; import org.apache.commons.lang.math.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.security.GroupMappingServiceProvider; +import org.apache.hadoop.security.ShellBasedUnixGroupsMapping; +import org.apache.hadoop.security.TestGroupsCaching; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.NodeId; @@ -58,6 +62,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event .AppAttemptAddedSchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event .SchedulerEvent; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair + .SimpleGroupsMapping; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.util.resource.Resources; import org.junit.After; @@ -127,6 +133,8 @@ public class TestCapacitySchedulerAutoCreatedQueueBase { public static final int NODE2_VCORES = 32; public static final int NODE3_VCORES = 48; + public static final String TEST_GROUP = "testusergroup"; + public static final String TEST_GROUPUSER = "testuser"; public static final String USER = "user_"; public static final String USER0 = USER + 0; public static final String USER1 = USER + 1; @@ -256,6 +264,35 @@ public class TestCapacitySchedulerAutoCreatedQueueBase { return conf; } + public static CapacitySchedulerConfiguration setupGroupQueueMappings + (String parentQueue, CapacitySchedulerConfiguration conf, String + leafQueueName) { + + List<UserGroupMappingPlacementRule.QueueMapping> existingMappings = + conf.getQueueMappings(); + + //set queue mapping + List<UserGroupMappingPlacementRule.QueueMapping> queueMappings = + new ArrayList<>(); + + //setup group mapping + conf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, + TestGroupsCaching.FakeunPrivilegedGroupMapping.class, ShellBasedUnixGroupsMapping.class); + conf.set(CommonConfigurationKeys.HADOOP_USER_GROUP_STATIC_OVERRIDES, + TEST_GROUPUSER +"=" + TEST_GROUP + ";invalid_user=invalid_group"); + + UserGroupMappingPlacementRule.QueueMapping userQueueMapping = + new UserGroupMappingPlacementRule.QueueMapping( + UserGroupMappingPlacementRule.QueueMapping.MappingType.GROUP, + TEST_GROUP, + getQueueMapping(parentQueue, leafQueueName)); + + queueMappings.add(userQueueMapping); + existingMappings.addAll(queueMappings); + conf.setQueueMappings(existingMappings); + return conf; + } + /** * @param conf, to be modified * @return, CS configuration which has C as an auto creation enabled parent @@ -505,15 +542,17 @@ public class TestCapacitySchedulerAutoCreatedQueueBase { } protected void validateInitialQueueEntitlement(CSQueue parentQueue, - String leafQueueName, float expectedTotalChildQueueAbsCapacity) + String leafQueueName, float expectedTotalChildQueueAbsCapacity, + Set<String> nodeLabels) throws SchedulerDynamicEditException { validateInitialQueueEntitlement(cs, parentQueue, leafQueueName, - expectedTotalChildQueueAbsCapacity); + expectedTotalChildQueueAbsCapacity, nodeLabels); } protected void validateInitialQueueEntitlement( CapacityScheduler capacityScheduler, CSQueue parentQueue, - String leafQueueName, float expectedTotalChildQueueAbsCapacity) + String leafQueueName, float expectedTotalChildQueueAbsCapacity, + Set<String> nodeLabels) throws SchedulerDynamicEditException { ManagedParentQueue autoCreateEnabledParentQueue = (ManagedParentQueue) parentQueue; @@ -532,7 +571,7 @@ public class TestCapacitySchedulerAutoCreatedQueueBase { QueueCapacities cap = autoCreateEnabledParentQueue.getLeafQueueTemplate() .getQueueCapacities(); - for (String label : accessibleNodeLabelsOnC) { + for (String label : nodeLabels) { validateCapacitiesByLabel(autoCreateEnabledParentQueue, leafQueue, label); QueueEntitlement expectedEntitlement = new QueueEntitlement( http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java index 01d5e6c..027d58c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java @@ -70,9 +70,13 @@ import org.junit.Assert; import org.junit.Test; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import static org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager + .NO_LABEL; import static org.apache.hadoop.yarn.server.resourcemanager.placement .UserGroupMappingPlacementRule.CURRENT_USER_MAPPING; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler @@ -118,13 +122,26 @@ public class TestCapacitySchedulerAutoQueueCreation ManagedParentQueue parentQueue = (ManagedParentQueue) cs.getQueue( PARENT_QUEUE); assertEquals(parentQueue, autoCreatedLeafQueue.getParent()); - validateInitialQueueEntitlement(parentQueue, USER0, 0.1f); + validateInitialQueueEntitlement(parentQueue, USER0, 0.1f, accessibleNodeLabelsOnC); validateUserAndAppLimits(autoCreatedLeafQueue, 1000, 1000); assertTrue(autoCreatedLeafQueue .getOrderingPolicy() instanceof FairOrderingPolicy); + + setupGroupQueueMappings("d", cs.getConfiguration(), "%user"); + cs.reinitialize(cs.getConfiguration(), mockRM.getRMContext()); + + submitApp(mockRM, cs.getQueue("d"), TEST_GROUPUSER, TEST_GROUPUSER, 1, 1); + autoCreatedLeafQueue = + (AutoCreatedLeafQueue) cs.getQueue(TEST_GROUPUSER); + parentQueue = (ManagedParentQueue) cs.getQueue("d"); + assertEquals(parentQueue, autoCreatedLeafQueue.getParent()); + validateInitialQueueEntitlement(parentQueue, TEST_GROUPUSER, 0.02f, + new HashSet<String>() {{ add(NO_LABEL); }}); + } finally { cleanupQueue(USER0); + cleanupQueue(TEST_GROUPUSER); } } @@ -158,8 +175,8 @@ public class TestCapacitySchedulerAutoQueueCreation PARENT_QUEUE); assertEquals(parentQueue, user0Queue.getParent()); assertEquals(parentQueue, user1Queue.getParent()); - validateInitialQueueEntitlement(parentQueue, USER0, 0.2f); - validateInitialQueueEntitlement(parentQueue, USER1, 0.2f); + validateInitialQueueEntitlement(parentQueue, USER0, 0.2f, accessibleNodeLabelsOnC); + validateInitialQueueEntitlement(parentQueue, USER1, 0.2f, accessibleNodeLabelsOnC); ApplicationAttemptId appAttemptId = appsInC.get(0); @@ -200,7 +217,7 @@ public class TestCapacitySchedulerAutoQueueCreation AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) cs.getQueue( USER1); validateInitialQueueEntitlement(parentQueue, leafQueue.getQueueName(), - 0.1f); + 0.1f, accessibleNodeLabelsOnC); } finally { cleanupQueue(USER0); @@ -482,12 +499,12 @@ public class TestCapacitySchedulerAutoQueueCreation //submit app1 as USER1 submitApp(mockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(parentQueue, USER1, 0.1f); + validateInitialQueueEntitlement(parentQueue, USER1, 0.1f, accessibleNodeLabelsOnC); //submit another app2 as USER2 ApplicationId user2AppId = submitApp(mockRM, parentQueue, USER2, USER2, 2, 1); - validateInitialQueueEntitlement(parentQueue, USER2, 0.2f); + validateInitialQueueEntitlement(parentQueue, USER2, 0.2f, accessibleNodeLabelsOnC); //submit another app3 as USER1 submitApp(mockRM, parentQueue, USER1, USER1, 3, 2); @@ -548,12 +565,12 @@ public class TestCapacitySchedulerAutoQueueCreation //submit app1 as USER1 submitApp(newMockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER1, 0.1f); + validateInitialQueueEntitlement(newCS, parentQueue, USER1, 0.1f, accessibleNodeLabelsOnC); CSQueue user1LeafQueue = newCS.getQueue(USER1); //submit another app2 as USER2 submitApp(newMockRM, parentQueue, USER2, USER2, 2, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER2, 0.2f); + validateInitialQueueEntitlement(newCS, parentQueue, USER2, 0.2f, accessibleNodeLabelsOnC); CSQueue user2LeafQueue = newCS.getQueue(USER2); //validate total activated abs capacity remains the same @@ -642,7 +659,7 @@ public class TestCapacitySchedulerAutoQueueCreation submitApp(USER1, USER1, NODEL_LABEL_GPU); //submit app1 as USER1 - validateInitialQueueEntitlement(parentQueue, USER1, 0.1f); + validateInitialQueueEntitlement(parentQueue, USER1, 0.1f, accessibleNodeLabelsOnC); } finally { cleanupQueue(USER1); } @@ -662,12 +679,12 @@ public class TestCapacitySchedulerAutoQueueCreation //submit app1 as USER1 submitApp(newMockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER1, 0.1f); + validateInitialQueueEntitlement(newCS, parentQueue, USER1, 0.1f, accessibleNodeLabelsOnC); //submit another app2 as USER2 ApplicationId user2AppId = submitApp(newMockRM, parentQueue, USER2, USER2, 2, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER2, 0.2f); + validateInitialQueueEntitlement(newCS, parentQueue, USER2, 0.2f, accessibleNodeLabelsOnC); //update parent queue capacity conf.setCapacity(C, 30f); @@ -692,7 +709,7 @@ public class TestCapacitySchedulerAutoQueueCreation //submit app1 as USER3 submitApp(newMockRM, parentQueue, USER3, USER3, 3, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f); + validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f, accessibleNodeLabelsOnC); AutoCreatedLeafQueue user3Queue = (AutoCreatedLeafQueue) newCS.getQueue( USER1); validateCapacities(user3Queue, 0.3f, 0.09f, 0.4f, 0.2f); @@ -701,7 +718,7 @@ public class TestCapacitySchedulerAutoQueueCreation //submit app1 as USER1 - is already activated. there should be no diff // in capacities submitApp(newMockRM, parentQueue, USER3, USER3, 4, 2); - validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f); + validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f, accessibleNodeLabelsOnC); validateCapacities(user3Queue, 0.3f, 0.09f, 0.4f, 0.2f); validateUserAndAppLimits(user3Queue, 900, 900); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167d607/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueManagementDynamicEditPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueManagementDynamicEditPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueManagementDynamicEditPolicy.java index 4dc56fb..5ff249f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueManagementDynamicEditPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueManagementDynamicEditPolicy.java @@ -59,12 +59,12 @@ public class TestQueueManagementDynamicEditPolicy extends //submit app1 as USER1 ApplicationId user1AppId = submitApp(mockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(parentQueue, USER1, 0.1f); + validateInitialQueueEntitlement(parentQueue, USER1, 0.1f, accessibleNodeLabelsOnC); //submit another app2 as USER2 ApplicationId user2AppId = submitApp(mockRM, parentQueue, USER2, USER2, 2, 1); - validateInitialQueueEntitlement(parentQueue, USER2, 0.2f); + validateInitialQueueEntitlement(parentQueue, USER2, 0.2f, accessibleNodeLabelsOnC); //validate total activated abs capacity assertEquals(0.2f, autoCreatedQueueManagementPolicy --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
