hadoop git commit: YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. (Takashi Ohnishi via rohithsharmaks) (cherry picked from commit e0b14f26f5201a149218276469434df511697acc)

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 1a38dd9ce -> 74831973c


YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. (Takashi 
Ohnishi via rohithsharmaks)
(cherry picked from commit e0b14f26f5201a149218276469434df511697acc)

Conflicts:

        hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74831973
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74831973
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74831973

Branch: refs/heads/branch-2.8
Commit: 74831973cb161bcc61eadc9574478e54260a21b6
Parents: 1a38dd9
Author: Jason Lowe <jl...@apache.org>
Authored: Mon Aug 15 19:45:45 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Aug 15 19:45:45 2016 +0000

----------------------------------------------------------------------
 .../hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/74831973/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java
index cf83e67..49a82c8 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java
+++ 
b/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
     for (int i=0; i<100; i++) {
       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);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org