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

YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma 

(cherry picked from commit e16e25ab1b)
This commit is contained in:
Jian He 2014-10-08 10:58:51 -07:00
parent 2c27b7b26f
commit 7ec65c8617
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -528,6 +528,8 @@ Release 2.6.0 - UNRELEASED
YARN-1857. CapacityScheduler headroom doesn't account for other AM's running. YARN-1857. CapacityScheduler headroom doesn't account for other AM's running.
(Chen He and Craig Welch via jianhe) (Chen He and Craig Welch via jianhe)
YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. (Ming Ma via jianhe)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
View File

@ -386,7 +386,15 @@ public class MockRM extends ResourceManager {
if (waitForAccepted) { if (waitForAccepted) {
waitForState(appId, RMAppState.ACCEPTED); waitForState(appId, RMAppState.ACCEPTED);
} }
return getRMContext().getRMApps().get(appId); RMApp rmApp = getRMContext().getRMApps().get(appId);
// unmanaged AM won't go to RMAppAttemptState.SCHEDULED.
if (waitForAccepted && !unmanaged) {
waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
RMAppAttemptState.SCHEDULED);
}
return rmApp;
} }
public MockNM registerNode(String nodeIdStr, int memory) throws Exception { public MockNM registerNode(String nodeIdStr, int memory) throws Exception {