Repository: hadoop Updated Branches: refs/heads/branch-2 18e5f2068 -> c3c8b0ffa
YARN-7045. Remove FSLeafQueue#addAppSchedulable. (Contributed by Sen Zhao via Yufei Gu) (cherry picked from commit a92ef030a2707182e90acee644e47c8ef7e1fd8d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3c8b0ff Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3c8b0ff Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3c8b0ff Branch: refs/heads/branch-2 Commit: c3c8b0ffab5ddce586e1a531d02be81b47951bf5 Parents: 18e5f20 Author: Yufei Gu <[email protected]> Authored: Thu Sep 21 12:31:07 2017 -0700 Committer: Yufei Gu <[email protected]> Committed: Thu Sep 21 12:40:37 2017 -0700 ---------------------------------------------------------------------- .../resourcemanager/scheduler/fair/FSLeafQueue.java | 10 ---------- .../resourcemanager/scheduler/fair/TestFSLeafQueue.java | 6 +++--- .../resourcemanager/scheduler/fair/TestFairScheduler.java | 6 +++--- 3 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3c8b0ff/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 c9a9142..d544718 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 @@ -95,16 +95,6 @@ public class FSLeafQueue extends FSQueue { } } - // for testing - void addAppSchedulable(FSAppAttempt appSched) { - writeLock.lock(); - try { - runnableApps.add(appSched); - } finally { - writeLock.unlock(); - } - } - /** * Removes the given app from this queue. * @return whether or not the app was runnable http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3c8b0ff/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.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/TestFSLeafQueue.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/TestFSLeafQueue.java index 2aed9bf..b6b3f7e 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/TestFSLeafQueue.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/TestFSLeafQueue.java @@ -89,8 +89,8 @@ public class TestFSLeafQueue extends FairSchedulerTestBase { FSAppAttempt app = mock(FSAppAttempt.class); Mockito.when(app.getDemand()).thenReturn(maxResource); - schedulable.addAppSchedulable(app); - schedulable.addAppSchedulable(app); + schedulable.addApp(app, true); + schedulable.addApp(app, true); schedulable.updateDemand(); @@ -165,7 +165,7 @@ public class TestFSLeafQueue extends FairSchedulerTestBase { @Override public void run() { for (int i=0; i < 500; i++) { - schedulable.addAppSchedulable(app); + schedulable.addApp(app, true); } } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3c8b0ff/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 073ba68..9044165 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 @@ -5220,12 +5220,12 @@ public class TestFairScheduler extends FairSchedulerTestBase { FSLeafQueue aQueue = new FSLeafQueue("root.queue1.a", scheduler, queue1); aQueue.setMaxShare(maxResource); - aQueue.addAppSchedulable(app1); + aQueue.addApp(app1, true); FSLeafQueue bQueue = new FSLeafQueue("root.queue1.b", scheduler, queue1); bQueue.setMaxShare(maxResource); - bQueue.addAppSchedulable(app2); + bQueue.addApp(app2, true); queue1.setMaxShare(maxResource); queue1.addChildQueue(aQueue); @@ -5269,7 +5269,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { FSAppAttempt app = mock(FSAppAttempt.class); Mockito.when(app.getDemand()).thenReturn(resource); Mockito.when(app.getResourceUsage()).thenReturn(resource); - child1.addAppSchedulable(app); + child1.addApp(app, true); child1.updateDemand(); String childQueueString = "{Name: root.parent.child1," --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
