Repository: hadoop Updated Branches: refs/heads/trunk 76b0370a2 -> 24ee9e343
YARN-2975. FSLeafQueue app lists are accessed without required locks. (kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/24ee9e34 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24ee9e34 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/24ee9e34 Branch: refs/heads/trunk Commit: 24ee9e3431d27811530ffa01d8d241133fd643fe Parents: 76b0370 Author: Karthik Kambatla <ka...@apache.org> Authored: Sat Dec 20 12:17:50 2014 -0800 Committer: Karthik Kambatla <ka...@apache.org> Committed: Sat Dec 20 12:17:50 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 + .../scheduler/fair/FSLeafQueue.java | 148 ++++++++++++++++--- .../scheduler/fair/FairScheduler.java | 10 +- .../scheduler/fair/MaxRunningAppsEnforcer.java | 8 +- .../scheduler/fair/QueueManager.java | 2 +- .../webapp/dao/FairSchedulerLeafQueueInfo.java | 14 +- .../scheduler/fair/TestFairScheduler.java | 56 ++++--- .../fair/TestMaxRunningAppsEnforcer.java | 64 ++++---- 8 files changed, 200 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3c77b93..cd3d777 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -256,6 +256,8 @@ Release 2.7.0 - UNRELEASED YARN-2952. Fixed incorrect version check in StateStore. (Rohith Sharmaks via jianhe) + YARN-2975. FSLeafQueue app lists are accessed without required locks. (kasha) + Release 2.6.1 - Unreleased INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.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/scheduler/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java index 63450da..5862a73 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java @@ -107,34 +107,94 @@ public class FSLeafQueue extends FSQueue { */ public boolean removeApp(FSAppAttempt app) { boolean runnable = false; + + // Remove app from runnable/nonRunnable list while holding the write lock writeLock.lock(); try { - if (runnableApps.remove(app)) { - runnable = true; - } else if (nonRunnableApps.remove(app)) { - runnable = false; //nop, runnable is initialised to false already - } else { - throw new IllegalStateException("Given app to remove " + app + - " does not exist in queue " + this); + runnable = runnableApps.remove(app); + if (!runnable) { + // removeNonRunnableApp acquires the write lock again, which is fine + if (!removeNonRunnableApp(app)) { + throw new IllegalStateException("Given app to remove " + app + + " does not exist in queue " + this); + } } } finally { writeLock.unlock(); } + // Update AM resource usage if needed if (runnable && app.isAmRunning() && app.getAMResource() != null) { Resources.subtractFrom(amResourceUsage, app.getAMResource()); } + return runnable; } - - public Collection<FSAppAttempt> getRunnableAppSchedulables() { - return runnableApps; + + /** + * Removes the given app if it is non-runnable and belongs to this queue + * @return true if the app is removed, false otherwise + */ + public boolean removeNonRunnableApp(FSAppAttempt app) { + writeLock.lock(); + try { + return nonRunnableApps.remove(app); + } finally { + writeLock.unlock(); + } } - - public List<FSAppAttempt> getNonRunnableAppSchedulables() { - return nonRunnableApps; + + public boolean isRunnableApp(FSAppAttempt attempt) { + readLock.lock(); + try { + return runnableApps.contains(attempt); + } finally { + readLock.unlock(); + } } - + + public boolean isNonRunnableApp(FSAppAttempt attempt) { + readLock.lock(); + try { + return nonRunnableApps.contains(attempt); + } finally { + readLock.unlock(); + } + } + + public void resetPreemptedResources() { + readLock.lock(); + try { + for (FSAppAttempt attempt : runnableApps) { + attempt.resetPreemptedResources(); + } + } finally { + readLock.unlock(); + } + } + + public void clearPreemptedResources() { + readLock.lock(); + try { + for (FSAppAttempt attempt : runnableApps) { + attempt.clearPreemptedResources(); + } + } finally { + readLock.unlock(); + } + } + + public List<FSAppAttempt> getCopyOfNonRunnableAppSchedulables() { + List<FSAppAttempt> appsToReturn = new ArrayList<FSAppAttempt>(); + readLock.lock(); + try { + appsToReturn.addAll(nonRunnableApps); + } finally { + readLock.unlock(); + } + return appsToReturn; + } + @Override public void collectSchedulerApplications( Collection<ApplicationAttemptId> apps) { @@ -162,7 +222,12 @@ public class FSLeafQueue extends FSQueue { @Override public void recomputeShares() { - policy.computeShares(getRunnableAppSchedulables(), getFairShare()); + readLock.lock(); + try { + policy.computeShares(runnableApps, getFairShare()); + } finally { + readLock.unlock(); + } } @Override @@ -349,9 +414,58 @@ public class FSLeafQueue extends FSQueue { @Override public int getNumRunnableApps() { - return runnableApps.size(); + readLock.lock(); + try { + return runnableApps.size(); + } finally { + readLock.unlock(); + } } - + + public int getNumNonRunnableApps() { + readLock.lock(); + try { + return nonRunnableApps.size(); + } finally { + readLock.unlock(); + } + } + + public int getNumPendingApps() { + int numPendingApps = 0; + readLock.lock(); + try { + for (FSAppAttempt attempt : runnableApps) { + if (attempt.isPending()) { + numPendingApps++; + } + } + numPendingApps += nonRunnableApps.size(); + } finally { + readLock.unlock(); + } + return numPendingApps; + } + + /** + * TODO: Based on how frequently this is called, we might want to club + * counting pending and active apps in the same method. + */ + public int getNumActiveApps() { + int numActiveApps = 0; + readLock.lock(); + try { + for (FSAppAttempt attempt : runnableApps) { + if (!attempt.isPending()) { + numActiveApps++; + } + } + } finally { + readLock.unlock(); + } + return numActiveApps; + } + @Override public ActiveUsersManager getActiveUsersManager() { return activeUsersManager; http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.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/scheduler/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index 4106285..49dfc3c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -400,9 +400,7 @@ public class FairScheduler extends try { // Reset preemptedResource for each app for (FSLeafQueue queue : getQueueManager().getLeafQueues()) { - for (FSAppAttempt app : queue.getRunnableAppSchedulables()) { - app.resetPreemptedResources(); - } + queue.resetPreemptedResources(); } while (Resources.greaterThan(RESOURCE_CALCULATOR, clusterResource, @@ -421,9 +419,7 @@ public class FairScheduler extends } finally { // Clear preemptedResources for each app for (FSLeafQueue queue : getQueueManager().getLeafQueues()) { - for (FSAppAttempt app : queue.getRunnableAppSchedulables()) { - app.clearPreemptedResources(); - } + queue.clearPreemptedResources(); } } @@ -1453,7 +1449,7 @@ public class FairScheduler extends return oldQueue.getQueueName(); } - if (oldQueue.getRunnableAppSchedulables().contains(attempt)) { + if (oldQueue.isRunnableApp(attempt)) { verifyMoveDoesNotViolateConstraints(attempt, oldQueue, targetQueue); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.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/scheduler/fair/MaxRunningAppsEnforcer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java index feeda1e..2c90edd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java @@ -170,7 +170,7 @@ public class MaxRunningAppsEnforcer { if (canAppBeRunnable(next.getQueue(), next.getUser())) { trackRunnableApp(next); FSAppAttempt appSched = next; - next.getQueue().getRunnableAppSchedulables().add(appSched); + next.getQueue().addApp(appSched, true); noLongerPendingApps.add(appSched); // No more than one app per list will be able to be made runnable, so @@ -187,8 +187,7 @@ public class MaxRunningAppsEnforcer { // pull them out from under the iterator. If they are not in these lists // in the first place, there is a bug. for (FSAppAttempt appSched : noLongerPendingApps) { - if (!appSched.getQueue().getNonRunnableAppSchedulables() - .remove(appSched)) { + if (!appSched.getQueue().removeNonRunnableApp(appSched)) { LOG.error("Can't make app runnable that does not already exist in queue" + " as non-runnable: " + appSched + ". This should never happen."); } @@ -239,7 +238,8 @@ public class MaxRunningAppsEnforcer { if (queue.getNumRunnableApps() < scheduler.getAllocationConfiguration() .getQueueMaxApps(queue.getName())) { if (queue instanceof FSLeafQueue) { - appLists.add(((FSLeafQueue)queue).getNonRunnableAppSchedulables()); + appLists.add( + ((FSLeafQueue)queue).getCopyOfNonRunnableAppSchedulables()); } else { for (FSQueue child : queue.getChildQueues()) { gatherPossiblyRunnableAppLists(child, appLists); http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.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/scheduler/fair/QueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java index 61b3b6c..0e625d7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java @@ -297,7 +297,7 @@ public class QueueManager { if (queue instanceof FSLeafQueue) { FSLeafQueue leafQueue = (FSLeafQueue)queue; return queue.getNumRunnableApps() == 0 && - leafQueue.getNonRunnableAppSchedulables().isEmpty(); + leafQueue.getNumNonRunnableApps() == 0; } else { for (FSQueue child : queue.getChildQueues()) { if (!isEmpty(child)) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerLeafQueueInfo.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/webapp/dao/FairSchedulerLeafQueueInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerLeafQueueInfo.java index d389b9f..189c877 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerLeafQueueInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerLeafQueueInfo.java @@ -18,14 +18,11 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao; -import java.util.Collection; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair - .FSAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue; @@ -40,15 +37,8 @@ public class FairSchedulerLeafQueueInfo extends FairSchedulerQueueInfo { public FairSchedulerLeafQueueInfo(FSLeafQueue queue, FairScheduler scheduler) { super(queue, scheduler); - Collection<FSAppAttempt> apps = queue.getRunnableAppSchedulables(); - for (FSAppAttempt app : apps) { - if (app.isPending()) { - numPendingApps++; - } else { - numActiveApps++; - } - } - numPendingApps += queue.getNonRunnableAppSchedulables().size(); + numPendingApps = queue.getNumPendingApps(); + numActiveApps = queue.getNumActiveApps(); } public int getNumActiveApplications() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.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/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java index 67cea37..5d079a3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java @@ -872,9 +872,9 @@ public class TestFairScheduler extends FairSchedulerTestBase { ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1); createApplicationWithAMResource(appAttemptId, "default", "user1", null); assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); assertEquals(0, scheduler.getQueueManager().getLeafQueue("default", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); assertEquals("root.user1", resourceManager.getRMContext().getRMApps() .get(appAttemptId.getApplicationId()).getQueue()); } @@ -888,11 +888,11 @@ public class TestFairScheduler extends FairSchedulerTestBase { ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1); createApplicationWithAMResource(appAttemptId, "default", "user2", null); assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); assertEquals(1, scheduler.getQueueManager().getLeafQueue("default", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); assertEquals(0, scheduler.getQueueManager().getLeafQueue("user2", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); } @Test @@ -1370,7 +1370,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { // That queue should have one app assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); AppAttemptRemovedSchedulerEvent appRemovedEvent1 = new AppAttemptRemovedSchedulerEvent( createAppAttemptId(1, 1), RMAppAttemptState.FINISHED, false); @@ -1380,7 +1380,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { // Queue should have no apps assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true) - .getRunnableAppSchedulables().size()); + .getNumRunnableApps()); } @Test @@ -2124,7 +2124,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { // The user1 queue should inherit the configurations from the root queue FSLeafQueue userQueue = scheduler.getQueueManager().getLeafQueue("user1", true); - assertEquals(1, userQueue.getRunnableAppSchedulables().size()); + assertEquals(1, userQueue.getNumRunnableApps()); assertEquals(10000, userQueue.getMinSharePreemptionTimeout()); assertEquals(15000, userQueue.getFairSharePreemptionTimeout()); assertEquals(.6f, userQueue.getFairSharePreemptionThreshold(), 0.001); @@ -3023,21 +3023,15 @@ public class TestFairScheduler extends FairSchedulerTestBase { private void verifyAppRunnable(ApplicationAttemptId attId, boolean runnable) { FSAppAttempt app = scheduler.getSchedulerApp(attId); FSLeafQueue queue = app.getQueue(); - Collection<FSAppAttempt> runnableApps = - queue.getRunnableAppSchedulables(); - Collection<FSAppAttempt> nonRunnableApps = - queue.getNonRunnableAppSchedulables(); - assertEquals(runnable, runnableApps.contains(app)); - assertEquals(!runnable, nonRunnableApps.contains(app)); + assertEquals(runnable, queue.isRunnableApp(app)); + assertEquals(!runnable, queue.isNonRunnableApp(app)); } private void verifyQueueNumRunnable(String queueName, int numRunnableInQueue, int numNonRunnableInQueue) { FSLeafQueue queue = scheduler.getQueueManager().getLeafQueue(queueName, false); - assertEquals(numRunnableInQueue, - queue.getRunnableAppSchedulables().size()); - assertEquals(numNonRunnableInQueue, - queue.getNonRunnableAppSchedulables().size()); + assertEquals(numRunnableInQueue, queue.getNumRunnableApps()); + assertEquals(numNonRunnableInQueue, queue.getNumNonRunnableApps()); } @Test @@ -3584,23 +3578,23 @@ public class TestFairScheduler extends FairSchedulerTestBase { // Should get put into jerry createSchedulingRequest(1024, "jerry", "someuser"); - assertEquals(1, jerryQueue.getRunnableAppSchedulables().size()); + assertEquals(1, jerryQueue.getNumRunnableApps()); // Should get forced into default createSchedulingRequest(1024, "newqueue", "someuser"); - assertEquals(1, jerryQueue.getRunnableAppSchedulables().size()); - assertEquals(1, defaultQueue.getRunnableAppSchedulables().size()); + assertEquals(1, jerryQueue.getNumRunnableApps()); + assertEquals(1, defaultQueue.getNumRunnableApps()); // Would get put into someuser because of user-as-default-queue, but should // be forced into default createSchedulingRequest(1024, "default", "someuser"); - assertEquals(1, jerryQueue.getRunnableAppSchedulables().size()); - assertEquals(2, defaultQueue.getRunnableAppSchedulables().size()); + assertEquals(1, jerryQueue.getNumRunnableApps()); + assertEquals(2, defaultQueue.getNumRunnableApps()); // Should get put into jerry because of user-as-default-queue createSchedulingRequest(1024, "default", "jerry"); - assertEquals(2, jerryQueue.getRunnableAppSchedulables().size()); - assertEquals(2, defaultQueue.getRunnableAppSchedulables().size()); + assertEquals(2, jerryQueue.getNumRunnableApps()); + assertEquals(2, defaultQueue.getNumRunnableApps()); } @Test @@ -3843,8 +3837,8 @@ public class TestFairScheduler extends FairSchedulerTestBase { scheduler.moveApplication(appId, "queue2"); FSAppAttempt app = scheduler.getSchedulerApp(appAttId); assertSame(targetQueue, app.getQueue()); - assertFalse(oldQueue.getRunnableAppSchedulables().contains(app)); - assertTrue(targetQueue.getRunnableAppSchedulables().contains(app)); + assertFalse(oldQueue.isRunnableApp(app)); + assertTrue(targetQueue.isRunnableApp(app)); assertEquals(Resource.newInstance(0, 0), oldQueue.getResourceUsage()); assertEquals(Resource.newInstance(1024, 1), targetQueue.getResourceUsage()); assertEquals(0, oldQueue.getNumRunnableApps()); @@ -3893,12 +3887,12 @@ public class TestFairScheduler extends FairSchedulerTestBase { createSchedulingRequest(1024, 1, "queue1", "user1", 3); FSAppAttempt app = scheduler.getSchedulerApp(appAttId); - assertTrue(oldQueue.getNonRunnableAppSchedulables().contains(app)); + assertTrue(oldQueue.isNonRunnableApp(app)); scheduler.moveApplication(appAttId.getApplicationId(), "queue2"); - assertFalse(oldQueue.getNonRunnableAppSchedulables().contains(app)); - assertFalse(targetQueue.getNonRunnableAppSchedulables().contains(app)); - assertTrue(targetQueue.getRunnableAppSchedulables().contains(app)); + assertFalse(oldQueue.isNonRunnableApp(app)); + assertFalse(targetQueue.isNonRunnableApp(app)); + assertTrue(targetQueue.isRunnableApp(app)); assertEquals(1, targetQueue.getNumRunnableApps()); assertEquals(1, queueMgr.getRootQueue().getNumRunnableApps()); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ee9e34/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestMaxRunningAppsEnforcer.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/fair/TestMaxRunningAppsEnforcer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestMaxRunningAppsEnforcer.java index 34c33b4..ac5748f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestMaxRunningAppsEnforcer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestMaxRunningAppsEnforcer.java @@ -97,13 +97,13 @@ public class TestMaxRunningAppsEnforcer { FSAppAttempt app1 = addApp(leaf1, "user"); addApp(leaf2, "user"); addApp(leaf2, "user"); - assertEquals(1, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(1, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); removeApp(app1); - assertEquals(0, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(0, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); } @Test @@ -114,13 +114,13 @@ public class TestMaxRunningAppsEnforcer { FSAppAttempt app1 = addApp(leaf1, "user"); addApp(leaf2, "user"); addApp(leaf2, "user"); - assertEquals(1, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(1, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); removeApp(app1); - assertEquals(0, leaf1.getRunnableAppSchedulables().size()); - assertEquals(2, leaf2.getRunnableAppSchedulables().size()); - assertEquals(0, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(0, leaf1.getNumRunnableApps()); + assertEquals(2, leaf2.getNumRunnableApps()); + assertEquals(0, leaf2.getNumNonRunnableApps()); } @Test @@ -133,14 +133,14 @@ public class TestMaxRunningAppsEnforcer { addApp(leaf1, "user2"); addApp(leaf1, "user3"); addApp(leaf2, "user1"); - assertEquals(2, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf1.getNonRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(2, leaf1.getNumRunnableApps()); + assertEquals(1, leaf1.getNumNonRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); removeApp(app1); - assertEquals(2, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(0, leaf1.getNonRunnableAppSchedulables().size()); - assertEquals(0, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(2, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(0, leaf1.getNumNonRunnableApps()); + assertEquals(0, leaf2.getNumNonRunnableApps()); } @Test @@ -153,14 +153,14 @@ public class TestMaxRunningAppsEnforcer { addApp(leaf2, "user"); clock.tick(20); addApp(leaf1, "user"); - assertEquals(1, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(1, leaf1.getNonRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(1, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(1, leaf1.getNumNonRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); removeApp(app1); - assertEquals(0, leaf1.getRunnableAppSchedulables().size()); - assertEquals(2, leaf2.getRunnableAppSchedulables().size()); - assertEquals(0, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(0, leaf1.getNumRunnableApps()); + assertEquals(2, leaf2.getNumRunnableApps()); + assertEquals(0, leaf2.getNumNonRunnableApps()); } @Test @@ -172,13 +172,13 @@ public class TestMaxRunningAppsEnforcer { addApp(leaf2, "user"); addApp(leaf2, "user"); addApp(leaf2, "user"); - assertEquals(1, leaf1.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getRunnableAppSchedulables().size()); - assertEquals(2, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(1, leaf1.getNumRunnableApps()); + assertEquals(1, leaf2.getNumRunnableApps()); + assertEquals(2, leaf2.getNumNonRunnableApps()); removeApp(app1); - assertEquals(0, leaf1.getRunnableAppSchedulables().size()); - assertEquals(2, leaf2.getRunnableAppSchedulables().size()); - assertEquals(1, leaf2.getNonRunnableAppSchedulables().size()); + assertEquals(0, leaf1.getNumRunnableApps()); + assertEquals(2, leaf2.getNumRunnableApps()); + assertEquals(1, leaf2.getNumNonRunnableApps()); } @Test
