Repository: hadoop Updated Branches: refs/heads/branch-2 fca24fbba -> 2a1bb6cb6
YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. (Takashi Ohnishi via rohithsharmaks) (cherry picked from commit e0b14f26f5201a149218276469434df511697acc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a1bb6cb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a1bb6cb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a1bb6cb Branch: refs/heads/branch-2 Commit: 2a1bb6cb67c796976bc277616022776bab05c2df Parents: fca24fb Author: Rohith Sharma K S <[email protected]> Authored: Mon Feb 29 10:38:14 2016 +0800 Committer: Rohith Sharma K S <[email protected]> Committed: Mon Feb 29 10:50:23 2016 +0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a1bb6cb/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f5ef4bd..edde68a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -175,6 +175,9 @@ Release 2.9.0 - UNRELEASED YARN-4701. When task logs are not available, port 8041 is referenced instead of port 8042 (haibochen via rkanter) + YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. + (Takashi Ohnishi via rohithsharmaks) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a1bb6cb/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);
