YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.

(cherry picked from commit 1217c8f6b4)
This commit is contained in:
Eric Payne 2016-05-16 20:27:07 +00:00
parent bb41547fb4
commit 42b2a34ed8
1 changed files with 2 additions and 1 deletions

View File

@ -1140,7 +1140,8 @@ public class TestFifoScheduler {
waitCount = 0;
while (waitCount++ != 20) {
report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
if (report_nm1.getAvailableResource().getMemory() != 0) {
if (null != report_nm1 &&
report_nm1.getAvailableResource().getMemory() != 0) {
break;
}
LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "