YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma
(cherry picked from commit e16e25ab1b
)
This commit is contained in:
parent
d9aa0f8333
commit
5e6f86e3aa
|
@ -558,6 +558,8 @@ Release 2.6.0 - UNRELEASED
|
|||
YARN-1857. CapacityScheduler headroom doesn't account for other AM's running.
|
||||
(Chen He and Craig Welch via jianhe)
|
||||
|
||||
YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. (Ming Ma via jianhe)
|
||||
|
||||
Release 2.5.1 - 2014-09-05
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -386,7 +386,15 @@ public class MockRM extends ResourceManager {
|
|||
if (waitForAccepted) {
|
||||
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 {
|
||||
|
|
Loading…
Reference in New Issue