Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6222. TestFairScheduler.testReservationMetrics is flaky. (Yufei Gu via kasha) 

(cherry picked from commit 694e680d20)
This commit is contained in:
Karthik Kambatla 2017-02-23 15:21:52 -08:00
parent 9b947611a7
commit 40bc9e7ddb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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

@ -407,8 +407,7 @@ public class FSLeafQueue extends FSQueue {
readLock.lock(); readLock.lock();
try { try {
for (FSAppAttempt app : runnableApps) { for (FSAppAttempt app : runnableApps) {
Resource pending = app.getAppAttemptResourceUsage().getPending(); if (!Resources.isNone(app.getPendingDemand()) &&
if (!Resources.isNone(pending) &&
(assignment || app.shouldCheckForStarvation())) { (assignment || app.shouldCheckForStarvation())) {
pendingForResourceApps.add(app); pendingForResourceApps.add(app);
} }

1
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

@ -5071,6 +5071,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
scheduler.handle(updateEvent); scheduler.handle(updateEvent);
createSchedulingRequestExistingApplication(1024, 1, 1, appAttemptId); createSchedulingRequestExistingApplication(1024, 1, 1, appAttemptId);
scheduler.update();
scheduler.handle(updateEvent); scheduler.handle(updateEvent);
// no reservation yet // no reservation yet