big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7045. Remove FSLeafQueue#addAppSchedulable. (Contributed by Sen Zhao via Yufei Gu)

Browse Source
This commit is contained in:
Yufei Gu 2017-09-21 12:31:07 -07:00
parent 263e2c692a
commit a92ef030a2
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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
View File

@ -94,16 +94,6 @@ void addApp(FSAppAttempt app, boolean runnable) {
} }
} }
// for testing
void addAppSchedulable(FSAppAttempt appSched) {
writeLock.lock();
try {
runnableApps.add(appSched);
} finally {
writeLock.unlock();
}
}
/** /**
* Removes the given app from this queue. * Removes the given app from this queue.
* @return whether or not the app was runnable * @return whether or not the app was runnable

6
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
View File

@ -89,8 +89,8 @@ public void testUpdateDemand() {
FSAppAttempt app = mock(FSAppAttempt.class); FSAppAttempt app = mock(FSAppAttempt.class);
Mockito.when(app.getDemand()).thenReturn(maxResource); Mockito.when(app.getDemand()).thenReturn(maxResource);
schedulable.addAppSchedulable(app); schedulable.addApp(app, true);
schedulable.addAppSchedulable(app); schedulable.addApp(app, true);
schedulable.updateDemand(); schedulable.updateDemand();
@ -165,7 +165,7 @@ public void testConcurrentAccess() {
@Override @Override
public void run() { public void run() {
for (int i=0; i < 500; i++) { for (int i=0; i < 500; i++) {
schedulable.addAppSchedulable(app); schedulable.addApp(app, true);
} }
} }
}); });

6
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
View File

@ -5221,12 +5221,12 @@ public void testUpdateDemand() throws IOException {
FSLeafQueue aQueue = FSLeafQueue aQueue =
new FSLeafQueue("root.queue1.a", scheduler, queue1); new FSLeafQueue("root.queue1.a", scheduler, queue1);
aQueue.setMaxShare(maxResource); aQueue.setMaxShare(maxResource);
aQueue.addAppSchedulable(app1); aQueue.addApp(app1, true);
FSLeafQueue bQueue = FSLeafQueue bQueue =
new FSLeafQueue("root.queue1.b", scheduler, queue1); new FSLeafQueue("root.queue1.b", scheduler, queue1);
bQueue.setMaxShare(maxResource); bQueue.setMaxShare(maxResource);
bQueue.addAppSchedulable(app2); bQueue.addApp(app2, true);
queue1.setMaxShare(maxResource); queue1.setMaxShare(maxResource);
queue1.addChildQueue(aQueue); queue1.addChildQueue(aQueue);
@ -5270,7 +5270,7 @@ public void testDumpState() throws IOException {
FSAppAttempt app = mock(FSAppAttempt.class); FSAppAttempt app = mock(FSAppAttempt.class);
Mockito.when(app.getDemand()).thenReturn(resource); Mockito.when(app.getDemand()).thenReturn(resource);
Mockito.when(app.getResourceUsage()).thenReturn(resource); Mockito.when(app.getResourceUsage()).thenReturn(resource);
child1.addAppSchedulable(app); child1.addApp(app, true);
child1.updateDemand(); child1.updateDemand();
String childQueueString = "{Name: root.parent.child1," String childQueueString = "{Name: root.parent.child1,"