diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java index 28a74498af9..75dee04fe8a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java @@ -127,7 +127,7 @@ // preempt other containers Resource skippedAMSize = Resource.newInstance(0, 0); Iterator desc = - leafQueue.getOrderingPolicy().getPreemptionIterator(); + leafQueue.getAppOrderingPolicy().getPreemptionIterator(); while (desc.hasNext()) { FiCaSchedulerApp fc = desc.next(); // When we complete preempt from one partition, we will remove from diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java index 7c57f9c2cae..4e8397b4a5b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java @@ -266,7 +266,7 @@ private void calculateToBePreemptedResourcePerApp(Resource clusterResource, Comparator reverseComp; OrderingPolicy queueOrderingPolicy = - tq.leafQueue.getOrderingPolicy(); + tq.leafQueue.getAppOrderingPolicy(); if (queueOrderingPolicy instanceof FairOrderingPolicy && (context.getIntraQueuePreemptionOrderPolicy() == IntraQueuePreemptionOrderPolicy.USERLIMIT_FIRST)) { @@ -367,7 +367,7 @@ private void getAlreadySelectedPreemptionCandidatesResource( Map perUserAMUsed) { Comparator taComparator; OrderingPolicy orderingPolicy = - tq.leafQueue.getOrderingPolicy(); + tq.leafQueue.getAppOrderingPolicy(); if (orderingPolicy instanceof FairOrderingPolicy && (context.getIntraQueuePreemptionOrderPolicy() == IntraQueuePreemptionOrderPolicy.USERLIMIT_FIRST)) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java index 8a1b47b5dee..e2574741b84 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java @@ -86,7 +86,7 @@ public int compare(TempAppPerPartition ta1, TempAppPerPartition ta2) { if (ta1.getUser().equals(ta2.getUser())) { AbstractComparatorOrderingPolicy acop = (AbstractComparatorOrderingPolicy) - ta1.getFiCaSchedulerApp().getCSLeafQueue().getOrderingPolicy(); + ta1.getFiCaSchedulerApp().getCSLeafQueue().getAppOrderingPolicy(); return acop.getComparator() .compare(ta1.getFiCaSchedulerApp(), ta2.getFiCaSchedulerApp()); } else { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index d6f20d7fa29..fcad97d5745 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -1247,7 +1247,7 @@ public Allocation allocate(ApplicationAttemptId applicationAttemptId, if (updateDemandForQueue != null && !application .isWaitingForAMContainer()) { - updateDemandForQueue.getOrderingPolicy().demandUpdated(application); + updateDemandForQueue.getAppOrderingPolicy().demandUpdated(application); } LOG.debug("Allocation for application {} : {} with cluster resource : {}", diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java index a88beef8c97..730d0adfaba 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java @@ -158,6 +158,8 @@ /* * Ordering policy inside a leaf queue to sort apps */ + public static final String APP_ORDERING_POLICY = "app-ordering-policy"; + public static final String FIFO_APP_ORDERING_POLICY = "fifo"; public static final String FAIR_APP_ORDERING_POLICY = "fair"; @@ -392,7 +394,7 @@ static String getQueueOrderingPolicyPrefix(String queue) { String queueName = PREFIX + queue + DOT + ORDERING_POLICY + DOT; return queueName; } - + private String getNodeLabelPrefix(String queue, String label) { if (label.equals(CommonNodeLabelsManager.NO_LABEL)) { return getQueuePrefix(queue); @@ -543,14 +545,11 @@ public int getUserLimit(String queue) { return userLimit; } - // TODO (wangda): We need to better distinguish app ordering policy and queue - // ordering policy's classname / configuration options, etc. And dedup code - // if possible. @SuppressWarnings("unchecked") public OrderingPolicy getAppOrderingPolicy( String queue) { - String policyType = get(getQueuePrefix(queue) + ORDERING_POLICY, + String policyType = get(getQueuePrefix(queue) + APP_ORDERING_POLICY, DEFAULT_APP_ORDERING_POLICY); OrderingPolicy orderingPolicy; @@ -570,7 +569,7 @@ public int getUserLimit(String queue) { } Map config = new HashMap(); - String confPrefix = getQueuePrefix(queue) + ORDERING_POLICY + "."; + String confPrefix = getQueuePrefix(queue) + APP_ORDERING_POLICY + "."; for (Map.Entry kv : this) { if (kv.getKey().startsWith(confPrefix)) { config.put(kv.getKey().substring(confPrefix.length()), kv.getValue()); @@ -1341,14 +1340,14 @@ public Integer getDefaultApplicationPriorityConfPerQueue(String queue) { } @VisibleForTesting - public void setOrderingPolicy(String queue, String policy) { - set(getQueuePrefix(queue) + ORDERING_POLICY, policy); + public void setAppOrderingPolicy(String queue, String policy) { + set(getQueuePrefix(queue) + APP_ORDERING_POLICY, policy); } @VisibleForTesting - public void setOrderingPolicyParameter(String queue, + public void setAppOrderingPolicyParameter(String queue, String parameterKey, String parameterValue) { - set(getQueuePrefix(queue) + ORDERING_POLICY + "." + parameterKey, + set(getQueuePrefix(queue) + APP_ORDERING_POLICY + "." + parameterKey, parameterValue); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index a178f9e9a0b..eb6a7c810ee 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -119,7 +119,7 @@ private volatile ResourceLimits cachedResourceLimitsForHeadroom = null; - private volatile OrderingPolicy orderingPolicy = null; + private volatile OrderingPolicy appOrderingPolicy = null; // record all ignore partition exclusivityRMContainer, this will be used to do // preemption, key is the partition of the RMContainer allocated on @@ -183,7 +183,7 @@ protected void setupQueueConfigs(Resource clusterResource, // absoluteMaxAvailCapacity during headroom/userlimit/allocation events) setQueueResourceLimitsInfo(clusterResource); - setOrderingPolicy( + setAppOrderingPolicy( conf.getAppOrderingPolicy(getQueuePath())); usersManager.setUserLimit(conf.getUserLimit(getQueuePath())); @@ -419,7 +419,7 @@ public int getNumPendingApplications() { public int getNumActiveApplications() { readLock.lock(); try { - return orderingPolicy.getNumSchedulableEntities(); + return appOrderingPolicy.getNumSchedulableEntities(); } finally { readLock.unlock(); } @@ -883,7 +883,7 @@ protected void activateApplications() { } } user.activateApplication(); - orderingPolicy.addSchedulableEntity(application); + appOrderingPolicy.addSchedulableEntity(application); application.updateAMContainerDiagnostics(AMState.ACTIVATED, null); queueUsage.incAMUsed(partitionName, @@ -967,7 +967,7 @@ private void removeApplicationAttempt( User user = usersManager.getUserAndAddIfAbsent(userName); String partitionName = application.getAppAMNodePartitionName(); - boolean wasActive = orderingPolicy.removeSchedulableEntity(application); + boolean wasActive = appOrderingPolicy.removeSchedulableEntity(application); if (!wasActive) { pendingOrderingPolicy.removeSchedulableEntity(application); } else{ @@ -1057,7 +1057,7 @@ public CSAssignment assignContainers(Resource clusterResource, if (LOG.isDebugEnabled()) { LOG.debug("assignContainers: partition=" + candidates.getPartition() - + " #applications=" + orderingPolicy.getNumSchedulableEntities()); + + " #applications=" + appOrderingPolicy.getNumSchedulableEntities()); } setPreemptionAllowed(currentResourceLimits, candidates.getPartition()); @@ -1098,7 +1098,7 @@ public CSAssignment assignContainers(Resource clusterResource, Map userLimits = new HashMap<>(); boolean needAssignToQueueCheck = true; for (Iterator assignmentIterator = - orderingPolicy.getAssignmentIterator(); + appOrderingPolicy.getAssignmentIterator(); assignmentIterator.hasNext(); ) { FiCaSchedulerApp application = assignmentIterator.next(); @@ -1338,7 +1338,7 @@ public void apply(Resource cluster, allocation.getAllocatedOrReservedResource(), schedulerContainer.getNodePartition(), schedulerContainer.getRmContainer()); - orderingPolicy.containerAllocated( + appOrderingPolicy.containerAllocated( schedulerContainer.getSchedulerApplicationAttempt(), schedulerContainer.getRmContainer()); } @@ -1668,7 +1668,7 @@ public void completedContainer(Resource clusterResource, if (removed) { // Inform the ordering policy - orderingPolicy.containerReleased(application, rmContainer); + appOrderingPolicy.containerReleased(application, rmContainer); releaseResource(clusterResource, application, container.getResource(), node.getPartition(), rmContainer); @@ -1830,7 +1830,7 @@ public void updateClusterResource(Resource clusterResource, usersManager.userLimitNeedsRecompute(); // Update application properties - for (FiCaSchedulerApp application : orderingPolicy + for (FiCaSchedulerApp application : appOrderingPolicy .getSchedulableEntities()) { computeUserLimitAndSetHeadroom(application, clusterResource, RMNodeLabelsManager.NO_LABEL, @@ -1909,7 +1909,7 @@ public void recoverContainer(Resource clusterResource, * Obtain (read-only) collection of active applications. */ public Collection getApplications() { - return Collections.unmodifiableCollection(orderingPolicy + return Collections.unmodifiableCollection(appOrderingPolicy .getSchedulableEntities()); } @@ -1919,7 +1919,7 @@ public void recoverContainer(Resource clusterResource, public Collection getAllApplications() { Collection apps = new HashSet( pendingOrderingPolicy.getSchedulableEntities()); - apps.addAll(orderingPolicy.getSchedulableEntities()); + apps.addAll(appOrderingPolicy.getSchedulableEntities()); return Collections.unmodifiableCollection(apps); } @@ -1997,7 +1997,7 @@ public void collectSchedulerApplications( .getSchedulableEntities()) { apps.add(pendingApp.getApplicationAttemptId()); } - for (FiCaSchedulerApp app : orderingPolicy.getSchedulableEntities()) { + for (FiCaSchedulerApp app : appOrderingPolicy.getSchedulableEntities()) { apps.add(app.getApplicationAttemptId()); } } finally { @@ -2095,20 +2095,19 @@ public void setMaxAMResourcePerQueuePercent( this.maxAMResourcePerQueuePercent = maxAMResourcePerQueuePercent; } - public OrderingPolicy - getOrderingPolicy() { - return orderingPolicy; + public OrderingPolicy getAppOrderingPolicy() { + return appOrderingPolicy; } - void setOrderingPolicy( - OrderingPolicy orderingPolicy) { + void setAppOrderingPolicy( + OrderingPolicy appOrderingPolicy) { writeLock.lock(); try { - if (null != this.orderingPolicy) { - orderingPolicy.addAllSchedulableEntities( - this.orderingPolicy.getSchedulableEntities()); + if (null != this.appOrderingPolicy) { + appOrderingPolicy.addAllSchedulableEntities( + this.appOrderingPolicy.getSchedulableEntities()); } - this.orderingPolicy = orderingPolicy; + this.appOrderingPolicy = appOrderingPolicy; } finally { writeLock.unlock(); } @@ -2124,7 +2123,7 @@ public void updateApplicationPriority(SchedulerApplication app writeLock.lock(); try { FiCaSchedulerApp attempt = app.getCurrentAppAttempt(); - boolean isActive = orderingPolicy.removeSchedulableEntity(attempt); + boolean isActive = appOrderingPolicy.removeSchedulableEntity(attempt); if (!isActive) { pendingOrderingPolicy.removeSchedulableEntity(attempt); } @@ -2132,7 +2131,7 @@ public void updateApplicationPriority(SchedulerApplication app attempt.setPriority(newAppPriority); if (isActive) { - orderingPolicy.addSchedulableEntity(attempt); + appOrderingPolicy.addSchedulableEntity(attempt); } else { pendingOrderingPolicy.addSchedulableEntity(attempt); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index 8f68e83afdb..ad55be091d0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -201,7 +201,7 @@ private void renderCommonLeafQueueInfo(ResponseInfo ri) { __("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit()) + "%"). __("Configured User Limit Factor:", lqinfo.getUserLimitFactor()). __("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). - __("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). + __("App Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). __("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). __("Intra-queue Preemption:", lqinfo.getIntraQueuePreemptionDisabled() diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java index a53e9212eeb..e925aad369d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java @@ -74,7 +74,7 @@ usedAMResource = new ResourceInfo(q.getQueueResourceUsage().getAMUsed()); preemptionDisabled = q.getPreemptionDisabled(); intraQueuePreemptionDisabled = q.getIntraQueuePreemptionDisabled(); - orderingPolicyInfo = q.getOrderingPolicy().getInfo(); + orderingPolicyInfo = q.getAppOrderingPolicy().getInfo(); defaultNodeLabelExpression = q.getDefaultNodeLabelExpression(); defaultPriority = q.getDefaultApplicationPriority().getPriority(); ArrayList usersList = users.getUsersList(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java index 4a762fa9b0f..4552b5867ca 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java @@ -657,7 +657,7 @@ public Object answer(InvocationOnMock invocation) { return apps.descendingIterator(); } }); - when(leafQueue.getOrderingPolicy()).thenReturn(so); + when(leafQueue.getAppOrderingPolicy()).thenReturn(so); Map> ignorePartitionContainers = new HashMap<>(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java index d02950dc955..4645074e5e2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java @@ -1363,7 +1363,7 @@ public Object answer(InvocationOnMock invocation) { return qApps.descendingIterator(); } }); - when(lq.getOrderingPolicy()).thenReturn(so); + when(lq.getAppOrderingPolicy()).thenReturn(so); if(setAMResourcePercent != 0.0f){ when(lq.getMaxAMResourcePerQueuePercent()).thenReturn(setAMResourcePercent); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java index fea82e53887..b94b8f60e5b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java @@ -643,7 +643,7 @@ public void testOrderOfActivatingThePriorityApplicationOnRMRestart() Assert.assertEquals(1, defaultQueue.getNumPendingApplications()); Iterator iterator = - defaultQueue.getOrderingPolicy().getSchedulableEntities().iterator(); + defaultQueue.getAppOrderingPolicy().getSchedulableEntities().iterator(); FiCaSchedulerApp fcApp2 = iterator.next(); Assert.assertEquals(app2.getCurrentAppAttempt().getAppAttemptId(), fcApp2.getApplicationAttemptId()); @@ -705,7 +705,7 @@ public void testOrderOfActivatingThePriorityApplicationOnRMRestart() // verify for order of activated applications iterator iterator = - defaultQueue.getOrderingPolicy().getSchedulableEntities().iterator(); + defaultQueue.getAppOrderingPolicy().getSchedulableEntities().iterator(); fcApp2 = iterator.next(); Assert.assertEquals(app2.getCurrentAppAttempt().getAppAttemptId(), fcApp2.getApplicationAttemptId()); @@ -743,7 +743,7 @@ public void testUpdatePriorityOnPendingAppAndKillAttempt() throws Exception { Collection appsPending = ((LeafQueue) defaultQueue).getPendingApplications(); Collection activeApps = - ((LeafQueue) defaultQueue).getOrderingPolicy().getSchedulableEntities(); + ((LeafQueue) defaultQueue).getAppOrderingPolicy().getSchedulableEntities(); // Verify app is in pending state Assert.assertEquals("Pending apps should be 1", 1, appsPending.size()); diff --git 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 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 855c793edc5..f2560cb405c 100644 --- 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 +++ 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 @@ -1219,7 +1219,7 @@ public void testAllocateReorder() throws Exception { FairOrderingPolicy fop = new FairOrderingPolicy(); fop.setSizeBasedWeight(true); - q.setOrderingPolicy(fop); + q.setAppOrderingPolicy(fop); String host = "127.0.0.1"; RMNode node = @@ -1299,7 +1299,7 @@ public void testAllocateReorder() throws Exception { //This happens because app2 has no demand/a magnitude of NaN, which //results in app1 and app2 being equal in the fairness comparison and //failling back to fifo (start) ordering - assertEquals(q.getOrderingPolicy().getAssignmentIterator().next().getId(), + assertEquals(q.getAppOrderingPolicy().getAssignmentIterator().next().getId(), appId1.toString()); //Now, allocate for app2 (this would be the first/AM allocation) @@ -1312,7 +1312,7 @@ public void testAllocateReorder() throws Exception { //verify re-ordering based on the allocation alone //Now, the first app for assignment is app2 - assertEquals(q.getOrderingPolicy().getAssignmentIterator().next().getId(), + assertEquals(q.getAppOrderingPolicy().getAssignmentIterator().next().getId(), appId2.toString()); rm.stop(); diff --git 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 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 d0cacde21e5..c799ac7203b 100644 --- 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 +++ 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 @@ -389,7 +389,7 @@ public static CapacitySchedulerConfiguration setupQueueConfiguration( conf.set(CapacitySchedulerConfiguration.PREFIX + C + DOT + CapacitySchedulerConfiguration .AUTO_CREATED_LEAF_QUEUE_TEMPLATE_PREFIX - + DOT + CapacitySchedulerConfiguration.ORDERING_POLICY, + + DOT + CapacitySchedulerConfiguration.APP_ORDERING_POLICY, FAIR_APP_ORDERING_POLICY); accessibleNodeLabelsOnC.add(NODEL_LABEL_GPU); diff --git 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 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 5f32e0ddff4..f994b21e43f 100644 --- 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 +++ 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 @@ -135,7 +135,7 @@ public void testAutoCreateLeafQueueCreation() throws Exception { validateContainerLimits(autoCreatedLeafQueue); assertTrue(autoCreatedLeafQueue - .getOrderingPolicy() instanceof FairOrderingPolicy); + .getAppOrderingPolicy() instanceof FairOrderingPolicy); setupGroupQueueMappings("d", cs.getConfiguration(), "%user"); cs.reinitialize(cs.getConfiguration(), mockRM.getRMContext()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java index 6a4391ab211..e1fd6ff5624 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java @@ -505,7 +505,7 @@ public void testFairConfiguration() throws Exception { //override default to fair String policyType = CapacitySchedulerConfiguration.PREFIX + tproot + - "." + CapacitySchedulerConfiguration.ORDERING_POLICY; + "." + CapacitySchedulerConfiguration.APP_ORDERING_POLICY; testConf.set(policyType, CapacitySchedulerConfiguration.FAIR_APP_ORDERING_POLICY); @@ -516,7 +516,7 @@ public void testFairConfiguration() throws Exception { //Now with sizeBasedWeight String sbwConfig = CapacitySchedulerConfiguration.PREFIX + tproot + - "." + CapacitySchedulerConfiguration.ORDERING_POLICY + "." + + "." + CapacitySchedulerConfiguration.APP_ORDERING_POLICY + "." + FairOrderingPolicy.ENABLE_SIZE_BASED_WEIGHT; testConf.set(sbwConfig, "true"); schedOrder = @@ -3200,7 +3200,7 @@ public void testFifoAssignment() throws Exception { LeafQueue a = stubLeafQueue((LeafQueue) queues.get(A)); - a.setOrderingPolicy(new FifoOrderingPolicy()); + a.setAppOrderingPolicy(new FifoOrderingPolicy()); String host_0_0 = "127.0.0.1"; String rack_0 = "rack_0"; @@ -3369,7 +3369,7 @@ public void testFairAssignment() throws Exception { OrderingPolicy schedulingOrder = new FairOrderingPolicy(); - a.setOrderingPolicy(schedulingOrder); + a.setAppOrderingPolicy(schedulingOrder); String host_0_0 = "127.0.0.1"; String rack_0 = "rack_0"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java index 683173af709..8b08bcb7432 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java @@ -151,9 +151,9 @@ public void testSizeBasedWeightNotAffectAppActivation() throws Exception { String queuePath = CapacitySchedulerConfiguration.ROOT + ".default"; csConf.set(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class.getCanonicalName()); - csConf.setOrderingPolicy(queuePath, + csConf.setAppOrderingPolicy(queuePath, CapacitySchedulerConfiguration.FAIR_APP_ORDERING_POLICY); - csConf.setOrderingPolicyParameter(queuePath, + csConf.setAppOrderingPolicyParameter(queuePath, FairOrderingPolicy.ENABLE_SIZE_BASED_WEIGHT, "true"); csConf.setMaximumApplicationMasterResourcePerQueuePercent(queuePath, 0.1f); @@ -165,7 +165,7 @@ public void testSizeBasedWeightNotAffectAppActivation() throws Exception { // Get LeafQueue LeafQueue lq = (LeafQueue) cs.getQueue("default"); - OrderingPolicy policy = lq.getOrderingPolicy(); + OrderingPolicy policy = lq.getAppOrderingPolicy(); Assert.assertTrue(policy instanceof FairOrderingPolicy); Assert.assertTrue(((FairOrderingPolicy)policy).getSizeBasedWeight());