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

(cherry picked from commit 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5)
This commit is contained in:
Eric Payne 2016-05-16 20:27:07 +00:00
parent 28a2f28e42
commit a552932b38

View File

@ -1151,7 +1151,8 @@ public void testResourceOverCommit() throws Exception {
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 "