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 ka...@apache.org on 2016/09/09 04:22:37 UTC
hadoop git commit: YARN-5566. Client-side NM graceful decom is not
triggered when jobs finish. Addendum to fix test flakiness. (Robert Kanter
via kasha)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 912631a22 -> 7a27b2a82
YARN-5566. Client-side NM graceful decom is not triggered when jobs finish. Addendum to fix test flakiness. (Robert Kanter via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7a27b2a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7a27b2a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7a27b2a8
Branch: refs/heads/branch-2.8
Commit: 7a27b2a82f2c970282c7bd78037ddee90da570b2
Parents: 912631a
Author: Karthik Kambatla <ka...@apache.org>
Authored: Thu Sep 8 21:11:20 2016 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Thu Sep 8 21:11:20 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/yarn/server/resourcemanager/MockRM.java | 3 +++
.../resourcemanager/TestResourceTrackerService.java | 10 ++++------
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a27b2a8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.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/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
index 1ed4816..beff436 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
@@ -636,6 +636,9 @@ public class MockRM extends ResourceManager {
public void waitForState(NodeId nodeId, NodeState finalState)
throws InterruptedException {
RMNode node = getRMContext().getRMNodes().get(nodeId);
+ if (node == null) {
+ node = getRMContext().getInactiveRMNodes().get(nodeId);
+ }
Assert.assertNotNull("node shouldn't be null", node);
int timeWaiting = 0;
while (!finalState.equals(node.getState())) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a27b2a8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.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/TestResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java
index f3f8644..dbcbe30 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java
@@ -253,19 +253,17 @@ public class TestResourceTrackerService extends NodeLabelTestBase {
rm.waitForState(nm3.getNodeId(), NodeState.DECOMMISSIONING);
nodeHeartbeat1 = nm1.nodeHeartbeat(true);
- rm.waitForState(nm1.getNodeId(), NodeState.RUNNING);
nodeHeartbeat2 = nm2.nodeHeartbeat(true);
- rm.waitForState(nm2.getNodeId(), NodeState.DECOMMISSIONED);
nodeHeartbeat3 = nm3.nodeHeartbeat(true);
- rm.waitForState(nm3.getNodeId(), NodeState.DECOMMISSIONED);
checkDecommissionedNMCount(rm, metricCount + 2);
+ rm.waitForState(nm2.getNodeId(), NodeState.DECOMMISSIONED);
+ rm.waitForState(nm3.getNodeId(), NodeState.DECOMMISSIONED);
- nodeHeartbeat1 = nm1.nodeHeartbeat(true);
Assert.assertTrue(NodeAction.NORMAL.equals(nodeHeartbeat1.getNodeAction()));
nodeHeartbeat2 = nm2.nodeHeartbeat(true);
- Assert.assertEquals(NodeAction.SHUTDOWN, nodeHeartbeat2.getNodeAction());
nodeHeartbeat3 = nm3.nodeHeartbeat(true);
+ Assert.assertEquals(NodeAction.SHUTDOWN, nodeHeartbeat2.getNodeAction());
Assert.assertEquals(NodeAction.SHUTDOWN, nodeHeartbeat3.getNodeAction());
}
@@ -306,8 +304,8 @@ public class TestResourceTrackerService extends NodeLabelTestBase {
// host1 should be DECOMMISSIONING due to running containers.
// host3 should become DECOMMISSIONED.
nm1.nodeHeartbeat(true);
- rm.waitForState(id1, NodeState.DECOMMISSIONING);
nm3.nodeHeartbeat(true);
+ rm.waitForState(id1, NodeState.DECOMMISSIONING);
rm.waitForState(id3, NodeState.DECOMMISSIONED);
nm1.nodeHeartbeat(aaid, 2, ContainerState.RUNNING);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org