Repository: hadoop Updated Branches: refs/heads/branch-2 280c9b840 -> 7e66b2f22
YARN-4613. Fix test failure in TestClientRMService#testGetClusterNodes. (Takashi Ohnishi via rohithsharmaks) (cherry picked from commit 10dc2c049304671f0ed9fd737a30cd843427b53e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e66b2f2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e66b2f2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e66b2f2 Branch: refs/heads/branch-2 Commit: 7e66b2f22c3c96d54a637491a8b354507ca334f0 Parents: 280c9b8 Author: rohithsharmaks <[email protected]> Authored: Sun Jan 24 23:36:15 2016 +0530 Committer: rohithsharmaks <[email protected]> Committed: Sun Jan 24 23:37:11 2016 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/resourcemanager/TestClientRMService.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e66b2f2/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b902567..4c6a4d7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -94,6 +94,9 @@ Release 2.9.0 - UNRELEASED YARN-4574. Fix random failure in TestAMRMClientOnRMRestart. (Takashi Ohnishi via rohithsharmaks) + YARN-4613. Fix test failure in TestClientRMService#testGetClusterNodes. + (Takashi Ohnishi via rohithsharmaks) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e66b2f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 0f892cd..df95957 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -209,6 +209,7 @@ public class TestClientRMService { // Now make the node unhealthy. node.nodeHeartbeat(false); + rm.NMwaitForState(node.getNodeId(), NodeState.UNHEALTHY); // Call again nodeReports = client.getClusterNodes(request).getNodeReports();
