Browse Source

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

Eric Payne 9 years ago
parent
commit
0ee36fd511

+ 2 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java

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