Browse Source

YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. (Takashi Ohnishi via rohithsharmaks)

Rohith Sharma K S 9 years ago
parent
commit
e0b14f26f5

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -236,6 +236,9 @@ Release 2.9.0 - UNRELEASED
     YARN-4701. When task logs are not available, port 8041 is referenced
     YARN-4701. When task logs are not available, port 8041 is referenced
     instead of port 8042 (haibochen via rkanter)
     instead of port 8042 (haibochen via rkanter)
 
 
+    YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization.
+    (Takashi Ohnishi via rohithsharmaks)
+
 Release 2.8.0 - UNRELEASED
 Release 2.8.0 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 4 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java

@@ -214,8 +214,10 @@ public class TestMiniYarnClusterNodeUtilization {
     // We check if the nodeUtilization is up to date
     // We check if the nodeUtilization is up to date
     for (int i=0; i<100; i++) {
     for (int i=0; i<100; i++) {
       for (RMNode ni : rmContext.getRMNodes().values()) {
       for (RMNode ni : rmContext.getRMNodes().values()) {
-        if (ni.getNodeUtilization().equals(nodeUtilization)) {
-          break;
+        if (ni.getNodeUtilization() != null) {
+            if (ni.getNodeUtilization().equals(nodeUtilization)) {
+              break;
+            }
         }
         }
       }
       }
       Thread.sleep(100);
       Thread.sleep(100);