You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ro...@apache.org on 2016/02/29 03:39:22 UTC
hadoop git commit: YARN-4566. Fix test failure in
TestMiniYarnClusterNodeUtilization. (Takashi Ohnishi via rohithsharmaks)
Repository: hadoop
Updated Branches:
refs/heads/trunk 321a80c75 -> e0b14f26f
YARN-4566. Fix test failure in TestMiniYarnClusterNodeUtilization. (Takashi Ohnishi via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e0b14f26
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e0b14f26
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e0b14f26
Branch: refs/heads/trunk
Commit: e0b14f26f5201a149218276469434df511697acc
Parents: 321a80c
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Mon Feb 29 10:38:14 2016 +0800
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Mon Feb 29 10:38:14 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/e0b14f26/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d2f871a..3c91fbd 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/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
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/e0b14f26/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);