Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-60: Fix minor merge conflict (bobby)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-08-31 19:28:21 +00:00
parent bbfbbf31c8
commit cde65024a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java
View File

@ -200,7 +200,7 @@ public void testUnhealthyRebooting() {
private RMNodeImpl getRunningNode() { private RMNodeImpl getRunningNode() {
NodeId nodeId = BuilderUtils.newNodeId("localhost", 0); NodeId nodeId = BuilderUtils.newNodeId("localhost", 0);
RMNodeImpl node = new RMNodeImpl(nodeId, rmContext,null, 0, 0, RMNodeImpl node = new RMNodeImpl(nodeId, rmContext,null, 0, 0,
null, null, null); null, null);
node.handle(new RMNodeEvent(node.getNodeID(), RMNodeEventType.STARTED)); node.handle(new RMNodeEvent(node.getNodeID(), RMNodeEventType.STARTED));
Assert.assertEquals(NodeState.RUNNING, node.getState()); Assert.assertEquals(NodeState.RUNNING, node.getState());
return node; return node;
@ -212,7 +212,7 @@ private RMNodeImpl getUnhealthyNode() {
status.setHealthReport("sick"); status.setHealthReport("sick");
status.setIsNodeHealthy(false); status.setIsNodeHealthy(false);
node.handle(new RMNodeStatusEvent(node.getNodeID(), status, node.handle(new RMNodeStatusEvent(node.getNodeID(), status,
new ArrayList<ContainerStatus>(), null, null, null)); new ArrayList<ContainerStatus>(), null, null));
Assert.assertEquals(NodeState.UNHEALTHY, node.getState()); Assert.assertEquals(NodeState.UNHEALTHY, node.getState());
return node; return node;
} }